From b7e84fa6048007cda7e6c8226e28bc2db90f792a Mon Sep 17 00:00:00 2001 From: Jacob Janzen Date: Sat, 28 Sep 2024 00:01:09 -0500 Subject: add file extensions to files --- nixos/.flake/flake.nix.org | 34 ++++++ nixos/.flake/flake.org | 34 ------ nixos/.flake/home/clang-format.nix.org | 15 +++ nixos/.flake/home/clang-format.org | 15 --- nixos/.flake/home/core.nix.org | 25 ++++ nixos/.flake/home/core.org | 25 ---- nixos/.flake/home/cursor.nix.org | 13 ++ nixos/.flake/home/cursor.org | 13 -- nixos/.flake/home/fonts.nix.org | 14 +++ nixos/.flake/home/fonts.org | 14 --- nixos/.flake/home/hyprland.nix.org | 175 +++++++++++++++++++++++++++ nixos/.flake/home/hyprland.org | 175 --------------------------- nixos/.flake/home/programs/core.nix.org | 46 +++++++ nixos/.flake/home/programs/core.org | 46 ------- nixos/.flake/home/programs/fastfetch.nix.org | 84 +++++++++++++ nixos/.flake/home/programs/fastfetch.org | 84 ------------- nixos/.flake/home/programs/foot.nix.org | 42 +++++++ nixos/.flake/home/programs/foot.org | 42 ------- nixos/.flake/home/programs/git.nix.org | 18 +++ nixos/.flake/home/programs/git.org | 18 --- nixos/.flake/home/programs/hyprlock.nix.org | 42 +++++++ nixos/.flake/home/programs/hyprlock.org | 42 ------- nixos/.flake/home/programs/ncmpcpp.nix.org | 28 +++++ nixos/.flake/home/programs/ncmpcpp.org | 28 ----- nixos/.flake/home/programs/neovim.nix.org | 32 +++++ nixos/.flake/home/programs/neovim.org | 32 ----- nixos/.flake/home/programs/ssh.nix.org | 13 ++ nixos/.flake/home/programs/ssh.org | 13 -- nixos/.flake/home/programs/waybar.nix.org | 149 +++++++++++++++++++++++ nixos/.flake/home/programs/waybar.org | 149 ----------------------- nixos/.flake/home/programs/zsh.nix.org | 87 +++++++++++++ nixos/.flake/home/programs/zsh.org | 87 ------------- nixos/.flake/home/scripts.nix.org | 43 +++++++ nixos/.flake/home/scripts.org | 43 ------- nixos/.flake/home/services/core.nix.org | 19 +++ nixos/.flake/home/services/core.org | 19 --- nixos/.flake/home/services/emacs.nix.org | 14 +++ nixos/.flake/home/services/emacs.org | 14 --- nixos/.flake/home/services/mako.nix.org | 13 ++ nixos/.flake/home/services/mako.org | 13 -- nixos/.flake/home/services/mpd.nix.org | 21 ++++ nixos/.flake/home/services/mpd.org | 21 ---- nixos/.flake/home/services/syncthing.nix.org | 12 ++ nixos/.flake/home/services/syncthing.org | 12 -- nixos/.flake/system/boot.nix.org | 11 ++ nixos/.flake/system/boot.org | 11 -- nixos/.flake/system/core.nix.org | 21 ++++ nixos/.flake/system/core.org | 21 ---- nixos/.flake/system/desktop.nix.org | 108 +++++++++++++++++ nixos/.flake/system/desktop.org | 108 ----------------- nixos/.flake/system/locale.nix.org | 11 ++ nixos/.flake/system/locale.org | 11 -- nixos/.flake/system/network.nix.org | 48 ++++++++ nixos/.flake/system/network.org | 48 -------- nixos/.flake/system/users.nix.org | 14 +++ nixos/.flake/system/users.org | 14 --- 56 files changed, 1152 insertions(+), 1152 deletions(-) create mode 100644 nixos/.flake/flake.nix.org delete mode 100644 nixos/.flake/flake.org create mode 100644 nixos/.flake/home/clang-format.nix.org delete mode 100644 nixos/.flake/home/clang-format.org create mode 100644 nixos/.flake/home/core.nix.org delete mode 100644 nixos/.flake/home/core.org create mode 100644 nixos/.flake/home/cursor.nix.org delete mode 100644 nixos/.flake/home/cursor.org create mode 100644 nixos/.flake/home/fonts.nix.org delete mode 100644 nixos/.flake/home/fonts.org create mode 100644 nixos/.flake/home/hyprland.nix.org delete mode 100644 nixos/.flake/home/hyprland.org create mode 100644 nixos/.flake/home/programs/core.nix.org delete mode 100644 nixos/.flake/home/programs/core.org create mode 100644 nixos/.flake/home/programs/fastfetch.nix.org delete mode 100644 nixos/.flake/home/programs/fastfetch.org create mode 100644 nixos/.flake/home/programs/foot.nix.org delete mode 100644 nixos/.flake/home/programs/foot.org create mode 100644 nixos/.flake/home/programs/git.nix.org delete mode 100644 nixos/.flake/home/programs/git.org create mode 100644 nixos/.flake/home/programs/hyprlock.nix.org delete mode 100644 nixos/.flake/home/programs/hyprlock.org create mode 100644 nixos/.flake/home/programs/ncmpcpp.nix.org delete mode 100644 nixos/.flake/home/programs/ncmpcpp.org create mode 100644 nixos/.flake/home/programs/neovim.nix.org delete mode 100644 nixos/.flake/home/programs/neovim.org create mode 100644 nixos/.flake/home/programs/ssh.nix.org delete mode 100644 nixos/.flake/home/programs/ssh.org create mode 100644 nixos/.flake/home/programs/waybar.nix.org delete mode 100644 nixos/.flake/home/programs/waybar.org create mode 100644 nixos/.flake/home/programs/zsh.nix.org delete mode 100644 nixos/.flake/home/programs/zsh.org create mode 100644 nixos/.flake/home/scripts.nix.org delete mode 100644 nixos/.flake/home/scripts.org create mode 100644 nixos/.flake/home/services/core.nix.org delete mode 100644 nixos/.flake/home/services/core.org create mode 100644 nixos/.flake/home/services/emacs.nix.org delete mode 100644 nixos/.flake/home/services/emacs.org create mode 100644 nixos/.flake/home/services/mako.nix.org delete mode 100644 nixos/.flake/home/services/mako.org create mode 100644 nixos/.flake/home/services/mpd.nix.org delete mode 100644 nixos/.flake/home/services/mpd.org create mode 100644 nixos/.flake/home/services/syncthing.nix.org delete mode 100644 nixos/.flake/home/services/syncthing.org create mode 100644 nixos/.flake/system/boot.nix.org delete mode 100644 nixos/.flake/system/boot.org create mode 100644 nixos/.flake/system/core.nix.org delete mode 100644 nixos/.flake/system/core.org create mode 100644 nixos/.flake/system/desktop.nix.org delete mode 100644 nixos/.flake/system/desktop.org create mode 100644 nixos/.flake/system/locale.nix.org delete mode 100644 nixos/.flake/system/locale.org create mode 100644 nixos/.flake/system/network.nix.org delete mode 100644 nixos/.flake/system/network.org create mode 100644 nixos/.flake/system/users.nix.org delete mode 100644 nixos/.flake/system/users.org (limited to 'nixos') diff --git a/nixos/.flake/flake.nix.org b/nixos/.flake/flake.nix.org new file mode 100644 index 0000000..1e3c71b --- /dev/null +++ b/nixos/.flake/flake.nix.org @@ -0,0 +1,34 @@ +#+title: Flake Root + +I use the unstable branch of =nixpkgs=. This file defines the outputs for my configuration (system and home). +#+begin_src nix :tangle ~/.flake/flake.nix :mkdirp yes + { + description = "My NixOS Configuration"; + + inputs = { + nixpkgs.url = "github:NixOS/nixpkgs/nixos-unstable"; + }; + + outputs = { + self, + nixpkgs, + home-manager, + ... + }@inputs: { + nixosConfigurations.nixos = nixpkgs.lib.nixosSystem { + system = "x86_64-linux"; + specialArgs = { inherit inputs; }; + modules = [ + ./system/core.nix + home-manager.nixosModules.home-manager + { + home-manager.backupFileExtension = "bak"; + home-manager.useGlobalPkgs = true; + home-manager.useUserPackages = true; + home-manager.users.jane = import ./home/core.nix; + } + ]; + }; + }; + } +#+end_src diff --git a/nixos/.flake/flake.org b/nixos/.flake/flake.org deleted file mode 100644 index 1e3c71b..0000000 --- a/nixos/.flake/flake.org +++ /dev/null @@ -1,34 +0,0 @@ -#+title: Flake Root - -I use the unstable branch of =nixpkgs=. This file defines the outputs for my configuration (system and home). -#+begin_src nix :tangle ~/.flake/flake.nix :mkdirp yes - { - description = "My NixOS Configuration"; - - inputs = { - nixpkgs.url = "github:NixOS/nixpkgs/nixos-unstable"; - }; - - outputs = { - self, - nixpkgs, - home-manager, - ... - }@inputs: { - nixosConfigurations.nixos = nixpkgs.lib.nixosSystem { - system = "x86_64-linux"; - specialArgs = { inherit inputs; }; - modules = [ - ./system/core.nix - home-manager.nixosModules.home-manager - { - home-manager.backupFileExtension = "bak"; - home-manager.useGlobalPkgs = true; - home-manager.useUserPackages = true; - home-manager.users.jane = import ./home/core.nix; - } - ]; - }; - }; - } -#+end_src diff --git a/nixos/.flake/home/clang-format.nix.org b/nixos/.flake/home/clang-format.nix.org new file mode 100644 index 0000000..64a2a64 --- /dev/null +++ b/nixos/.flake/home/clang-format.nix.org @@ -0,0 +1,15 @@ +#+title: Clang Format Default Options + +#+begin_src nix :tangle ~/.flake/home/clang-format.nix :mkdirp yes + { config, pkgs, ... }: + + { + home.file.".clang-format".text = '' + BasedOnStyle: LLVM + IndentWidth: 4 + BreakBeforeBraces: Linux + AllowShortIfStatementsOnASingleLine: false + IndentCaseLabels: false + ''; + } +#+end_src diff --git a/nixos/.flake/home/clang-format.org b/nixos/.flake/home/clang-format.org deleted file mode 100644 index 64a2a64..0000000 --- a/nixos/.flake/home/clang-format.org +++ /dev/null @@ -1,15 +0,0 @@ -#+title: Clang Format Default Options - -#+begin_src nix :tangle ~/.flake/home/clang-format.nix :mkdirp yes - { config, pkgs, ... }: - - { - home.file.".clang-format".text = '' - BasedOnStyle: LLVM - IndentWidth: 4 - BreakBeforeBraces: Linux - AllowShortIfStatementsOnASingleLine: false - IndentCaseLabels: false - ''; - } -#+end_src diff --git a/nixos/.flake/home/core.nix.org b/nixos/.flake/home/core.nix.org new file mode 100644 index 0000000..25f3f2e --- /dev/null +++ b/nixos/.flake/home/core.nix.org @@ -0,0 +1,25 @@ +#+title: Core Home Configuration + +Set up home manager for my user account and import submodules. +#+begin_src nix :tangle ~/.flake/home/core.nix :mkdirp yes + { config, pkgs, ... }: + + { + imports = [ + ./clang-format.nix + ./cursor.nix + ./fonts.nix + ./hyprland.nix + ./programs/core.nix + ./scripts.nix + ./services/core.nix + ]; + + home.username = "jane"; + home.homeDirectory = "/home/jane"; + home.file.".wallpaper".source = ./.wallpaper; + + home.stateVersion = "24.05"; + programs.home-manager.enable = true; + } +#+end_src diff --git a/nixos/.flake/home/core.org b/nixos/.flake/home/core.org deleted file mode 100644 index 25f3f2e..0000000 --- a/nixos/.flake/home/core.org +++ /dev/null @@ -1,25 +0,0 @@ -#+title: Core Home Configuration - -Set up home manager for my user account and import submodules. -#+begin_src nix :tangle ~/.flake/home/core.nix :mkdirp yes - { config, pkgs, ... }: - - { - imports = [ - ./clang-format.nix - ./cursor.nix - ./fonts.nix - ./hyprland.nix - ./programs/core.nix - ./scripts.nix - ./services/core.nix - ]; - - home.username = "jane"; - home.homeDirectory = "/home/jane"; - home.file.".wallpaper".source = ./.wallpaper; - - home.stateVersion = "24.05"; - programs.home-manager.enable = true; - } -#+end_src diff --git a/nixos/.flake/home/cursor.nix.org b/nixos/.flake/home/cursor.nix.org new file mode 100644 index 0000000..15396a0 --- /dev/null +++ b/nixos/.flake/home/cursor.nix.org @@ -0,0 +1,13 @@ +#+title: Cursor Configuration + +Use =vanilla-dmz= cursor size 16. +#+begin_src nix :tangle ~/.flake/home/cursor.nix :mkdirp yes +{ config, pkgs, ... }: + +{ + home.file.".icons/default".source = "${pkgs.vanilla-dmz}/share/icons/Vanilla-DMZ"; + xresources.properties = { + "Xcursor.size" = 16; + }; +} +#+end_src diff --git a/nixos/.flake/home/cursor.org b/nixos/.flake/home/cursor.org deleted file mode 100644 index 15396a0..0000000 --- a/nixos/.flake/home/cursor.org +++ /dev/null @@ -1,13 +0,0 @@ -#+title: Cursor Configuration - -Use =vanilla-dmz= cursor size 16. -#+begin_src nix :tangle ~/.flake/home/cursor.nix :mkdirp yes -{ config, pkgs, ... }: - -{ - home.file.".icons/default".source = "${pkgs.vanilla-dmz}/share/icons/Vanilla-DMZ"; - xresources.properties = { - "Xcursor.size" = 16; - }; -} -#+end_src diff --git a/nixos/.flake/home/fonts.nix.org b/nixos/.flake/home/fonts.nix.org new file mode 100644 index 0000000..3a01993 --- /dev/null +++ b/nixos/.flake/home/fonts.nix.org @@ -0,0 +1,14 @@ +#+title: Font Configuration + +Install fonts necessary for my configuration. +#+begin_src nix :tangle ~/.flake/home/fonts.nix :mkdirp yes +{ config, pkgs, ... }: + +{ + fonts.fontconfig.enable = true; + home.packages = with pkgs; [ + cm_unicode + (pkgs.nerdfonts.override { fonts = [ "SourceCodePro" ]; }) + ]; +} +#+end_src diff --git a/nixos/.flake/home/fonts.org b/nixos/.flake/home/fonts.org deleted file mode 100644 index 3a01993..0000000 --- a/nixos/.flake/home/fonts.org +++ /dev/null @@ -1,14 +0,0 @@ -#+title: Font Configuration - -Install fonts necessary for my configuration. -#+begin_src nix :tangle ~/.flake/home/fonts.nix :mkdirp yes -{ config, pkgs, ... }: - -{ - fonts.fontconfig.enable = true; - home.packages = with pkgs; [ - cm_unicode - (pkgs.nerdfonts.override { fonts = [ "SourceCodePro" ]; }) - ]; -} -#+end_src diff --git a/nixos/.flake/home/hyprland.nix.org b/nixos/.flake/home/hyprland.nix.org new file mode 100644 index 0000000..725f920 --- /dev/null +++ b/nixos/.flake/home/hyprland.nix.org @@ -0,0 +1,175 @@ +#+title: Hyprland Configuration + +Open my Hyprland configuration. +#+begin_src nix :tangle ~/.flake/home/hyprland.nix :mkdirp yes + { config, pkgs, ... }: + + { + wayland.windowManager.hyprland = { + enable = true; + settings = { +#+end_src + +I have a 1440p monitor and a 1080p monitor to its left rotated to be vertical. +#+begin_src nix :tangle ~/.flake/home/hyprland.nix :mkdirp yes + monitor = [ "DP-2, 2560x1440@180, 0x0, 1" "HDMI-A-2, 1920x1080@60, -1080x-100, 1, transform, 3" ]; +#+end_src + +Set terminal, file manager, and menu. +#+begin_src nix :tangle ~/.flake/home/hyprland.nix :mkdirp yes + "$terminal" = "foot"; + "$fileManager" = "dolphin"; + "$menu" = "fuzzel"; +#+end_src + +Enable startup applications: +- =nm-applet= for network configuration +- =blueman-applet= for bluetooth configuration +- =waybar= as top bar +- =swaybg= to set wallpaper +- =mpdscribble= as Last.fm scrobbler program. +#+begin_src nix :tangle ~/.flake/home/hyprland.nix :mkdirp yes + exec-once = [ + "nm-applet &" + "blueman-applet &" + "waybar" + "swaybg -m fill -i ~/.wallpaper" + "mpdscribble" + ]; +#+end_src + +Specify cursor size. +#+begin_src nix :tangle ~/.flake/home/hyprland.nix :mkdirp yes + env = [ + "XCURSOR_SIZE,24" + "HYPRCURSOR_SIZE,24" + ]; +#+end_src + +Set general appearance of the window manager. +#+begin_src nix :tangle ~/.flake/home/hyprland.nix :mkdirp yes + general = { + gaps_in = 5; + gaps_out = 20; + border_size = 2; + resize_on_border = false; + layout = "dwindle"; + "col.active_border" = "rgba(33ccffee) rgba(00ff99ee) 45deg"; + "col.inactive_border" = "rgba(595959aa)"; + }; +#+end_src + +Set window decorations. +#+begin_src nix :tangle ~/.flake/home/hyprland.nix :mkdirp yes + decoration = { + rounding = 10; + active_opacity = 1.0; + inactive_opacity = 1.0; + drop_shadow = true; + shadow_range = 4; + shadow_render_power = 3; + "col.shadow" = "rgba(1a1a1aee)"; + blur = { + enabled = true; + size = 3; + passes = 1; + vibrancy = "0.1696"; + }; + }; +#+end_src + +Set window animations. +#+begin_src nix :tangle ~/.flake/home/hyprland.nix :mkdirp yes + animations = { + enabled = true; + bezier = "myBezier, 0.05, 0.9, 0.1, 1.05"; + animation = [ + "windows, 1, 7, myBezier" + "windowsOut, 1, 7, default, popin 80%" + "border, 1, 10, default" "borderangle, 1, 8, default" + "fade, 1, 7, default" "workspaces, 1, 6, default" + ]; + }; +#+end_src + +Configure layouts. +#+begin_src nix :tangle ~/.flake/home/hyprland.nix :mkdirp yes + dwindle = { + pseudotile = true; + preserve_split = true; + }; + master = { + new_status = "master"; + }; +#+end_src + +Configure the inputs. +#+begin_src nix :tangle ~/.flake/home/hyprland.nix :mkdirp yes + input = { + kb_layout = "us"; + follow_mouse = 1; + sensitivity = 0; + }; +#+end_src + +Configure window manager controls. +#+begin_src nix :tangle ~/.flake/home/hyprland.nix :mkdirp yes + "$mainMod" = "SUPER"; + bind = [ + "$mainMod, RETURN, exec, $terminal" + "$mainMod SHIFT, Q, killactive" + "$mainMod, E, exec, $fileManager" + "$mainMod SHIFT, SPACE, togglefloating" + "$mainMod, D, exec, $menu" + "$mainMod, P, pseudo" + "$mainMod SHIFT, E, togglesplit" + "$mainMod, H, movefocus, l" + "$mainMod, J, movefocus, d" + "$mainMod, K, movefocus, u" + "$mainMod, L, movefocus, r" + "$mainMod, 1, workspace, 1" + "$mainMod, 2, workspace, 2" + "$mainMod, 3, workspace, 3" + "$mainMod, 4, workspace, 4" + "$mainMod, 5, workspace, 5" + "$mainMod, 6, workspace, 6" + "$mainMod, 7, workspace, 7" + "$mainMod, 8, workspace, 8" + "$mainMod, 9, workspace, 9" + "$mainMod, 0, workspace, 10" + "$mainMod SHIFT, 1, movetoworkspace, 1" + "$mainMod SHIFT, 2, movetoworkspace, 2" + "$mainMod SHIFT, 3, movetoworkspace, 3" + "$mainMod SHIFT, 4, movetoworkspace, 4" + "$mainMod SHIFT, 5, movetoworkspace, 5" + "$mainMod SHIFT, 6, movetoworkspace, 6" + "$mainMod SHIFT, 7, movetoworkspace, 7" + "$mainMod SHIFT, 8, movetoworkspace, 8" + "$mainMod SHIFT, 9, movetoworkspace, 9" + "$mainMod SHIFT, 0, movetoworkspace, 10" + "$mainMod CONTROL, L, exec, hyprlock" + "$mainMod, S, exec, hyprshot -m window --clipboard-only" + "$mainMod SHIFT, S, exec, hyprshot -m region --clipboard-only" + "$mainMod SHIFT CONTROL, S, exec, hyprshot -m output --clipboard-only" + "$mainMod, M, exec, ~/.local/bin/poweroptions.sh" + "$mainMod, F, fullscreen" + ]; + bindel = [ + ",XF86AudioRaiseVolume, exec, wpctl set-volume @DEFAULT_AUDIO_SINK@ 5%+" + ",XF86AudioLowerVolume, exec, wpctl set-volume @DEFAULT_AUDIO_SINK@ 5%-" + ",XF86AudioMute, exec, wpctl set-mute @DEFAULT_AUDIO_SINK@ toggle" + ",XF86Eject, exec, mpc toggle" + ]; + bindm = [ + "$mainMod, mouse:272, movewindow" + "$mainMod, mouse:273, resizewindow" + ]; + windowrulev2 = "suppressevent maximize, class:.*"; +#+end_src + +Close my Hyprland configuration. +#+begin_src nix :tangle ~/.flake/home/hyprland.nix :mkdirp yes + }; + }; + } +#+end_src diff --git a/nixos/.flake/home/hyprland.org b/nixos/.flake/home/hyprland.org deleted file mode 100644 index 725f920..0000000 --- a/nixos/.flake/home/hyprland.org +++ /dev/null @@ -1,175 +0,0 @@ -#+title: Hyprland Configuration - -Open my Hyprland configuration. -#+begin_src nix :tangle ~/.flake/home/hyprland.nix :mkdirp yes - { config, pkgs, ... }: - - { - wayland.windowManager.hyprland = { - enable = true; - settings = { -#+end_src - -I have a 1440p monitor and a 1080p monitor to its left rotated to be vertical. -#+begin_src nix :tangle ~/.flake/home/hyprland.nix :mkdirp yes - monitor = [ "DP-2, 2560x1440@180, 0x0, 1" "HDMI-A-2, 1920x1080@60, -1080x-100, 1, transform, 3" ]; -#+end_src - -Set terminal, file manager, and menu. -#+begin_src nix :tangle ~/.flake/home/hyprland.nix :mkdirp yes - "$terminal" = "foot"; - "$fileManager" = "dolphin"; - "$menu" = "fuzzel"; -#+end_src - -Enable startup applications: -- =nm-applet= for network configuration -- =blueman-applet= for bluetooth configuration -- =waybar= as top bar -- =swaybg= to set wallpaper -- =mpdscribble= as Last.fm scrobbler program. -#+begin_src nix :tangle ~/.flake/home/hyprland.nix :mkdirp yes - exec-once = [ - "nm-applet &" - "blueman-applet &" - "waybar" - "swaybg -m fill -i ~/.wallpaper" - "mpdscribble" - ]; -#+end_src - -Specify cursor size. -#+begin_src nix :tangle ~/.flake/home/hyprland.nix :mkdirp yes - env = [ - "XCURSOR_SIZE,24" - "HYPRCURSOR_SIZE,24" - ]; -#+end_src - -Set general appearance of the window manager. -#+begin_src nix :tangle ~/.flake/home/hyprland.nix :mkdirp yes - general = { - gaps_in = 5; - gaps_out = 20; - border_size = 2; - resize_on_border = false; - layout = "dwindle"; - "col.active_border" = "rgba(33ccffee) rgba(00ff99ee) 45deg"; - "col.inactive_border" = "rgba(595959aa)"; - }; -#+end_src - -Set window decorations. -#+begin_src nix :tangle ~/.flake/home/hyprland.nix :mkdirp yes - decoration = { - rounding = 10; - active_opacity = 1.0; - inactive_opacity = 1.0; - drop_shadow = true; - shadow_range = 4; - shadow_render_power = 3; - "col.shadow" = "rgba(1a1a1aee)"; - blur = { - enabled = true; - size = 3; - passes = 1; - vibrancy = "0.1696"; - }; - }; -#+end_src - -Set window animations. -#+begin_src nix :tangle ~/.flake/home/hyprland.nix :mkdirp yes - animations = { - enabled = true; - bezier = "myBezier, 0.05, 0.9, 0.1, 1.05"; - animation = [ - "windows, 1, 7, myBezier" - "windowsOut, 1, 7, default, popin 80%" - "border, 1, 10, default" "borderangle, 1, 8, default" - "fade, 1, 7, default" "workspaces, 1, 6, default" - ]; - }; -#+end_src - -Configure layouts. -#+begin_src nix :tangle ~/.flake/home/hyprland.nix :mkdirp yes - dwindle = { - pseudotile = true; - preserve_split = true; - }; - master = { - new_status = "master"; - }; -#+end_src - -Configure the inputs. -#+begin_src nix :tangle ~/.flake/home/hyprland.nix :mkdirp yes - input = { - kb_layout = "us"; - follow_mouse = 1; - sensitivity = 0; - }; -#+end_src - -Configure window manager controls. -#+begin_src nix :tangle ~/.flake/home/hyprland.nix :mkdirp yes - "$mainMod" = "SUPER"; - bind = [ - "$mainMod, RETURN, exec, $terminal" - "$mainMod SHIFT, Q, killactive" - "$mainMod, E, exec, $fileManager" - "$mainMod SHIFT, SPACE, togglefloating" - "$mainMod, D, exec, $menu" - "$mainMod, P, pseudo" - "$mainMod SHIFT, E, togglesplit" - "$mainMod, H, movefocus, l" - "$mainMod, J, movefocus, d" - "$mainMod, K, movefocus, u" - "$mainMod, L, movefocus, r" - "$mainMod, 1, workspace, 1" - "$mainMod, 2, workspace, 2" - "$mainMod, 3, workspace, 3" - "$mainMod, 4, workspace, 4" - "$mainMod, 5, workspace, 5" - "$mainMod, 6, workspace, 6" - "$mainMod, 7, workspace, 7" - "$mainMod, 8, workspace, 8" - "$mainMod, 9, workspace, 9" - "$mainMod, 0, workspace, 10" - "$mainMod SHIFT, 1, movetoworkspace, 1" - "$mainMod SHIFT, 2, movetoworkspace, 2" - "$mainMod SHIFT, 3, movetoworkspace, 3" - "$mainMod SHIFT, 4, movetoworkspace, 4" - "$mainMod SHIFT, 5, movetoworkspace, 5" - "$mainMod SHIFT, 6, movetoworkspace, 6" - "$mainMod SHIFT, 7, movetoworkspace, 7" - "$mainMod SHIFT, 8, movetoworkspace, 8" - "$mainMod SHIFT, 9, movetoworkspace, 9" - "$mainMod SHIFT, 0, movetoworkspace, 10" - "$mainMod CONTROL, L, exec, hyprlock" - "$mainMod, S, exec, hyprshot -m window --clipboard-only" - "$mainMod SHIFT, S, exec, hyprshot -m region --clipboard-only" - "$mainMod SHIFT CONTROL, S, exec, hyprshot -m output --clipboard-only" - "$mainMod, M, exec, ~/.local/bin/poweroptions.sh" - "$mainMod, F, fullscreen" - ]; - bindel = [ - ",XF86AudioRaiseVolume, exec, wpctl set-volume @DEFAULT_AUDIO_SINK@ 5%+" - ",XF86AudioLowerVolume, exec, wpctl set-volume @DEFAULT_AUDIO_SINK@ 5%-" - ",XF86AudioMute, exec, wpctl set-mute @DEFAULT_AUDIO_SINK@ toggle" - ",XF86Eject, exec, mpc toggle" - ]; - bindm = [ - "$mainMod, mouse:272, movewindow" - "$mainMod, mouse:273, resizewindow" - ]; - windowrulev2 = "suppressevent maximize, class:.*"; -#+end_src - -Close my Hyprland configuration. -#+begin_src nix :tangle ~/.flake/home/hyprland.nix :mkdirp yes - }; - }; - } -#+end_src diff --git a/nixos/.flake/home/programs/core.nix.org b/nixos/.flake/home/programs/core.nix.org new file mode 100644 index 0000000..3bf0fab --- /dev/null +++ b/nixos/.flake/home/programs/core.nix.org @@ -0,0 +1,46 @@ +#+title: Core Program Configuration + +This is the core of my program configuration. This file installs programs that do not require additional configuration. Note that Discord is not FOSS and that =prismlauncher= is a launcher for Minecraft. +#+begin_src nix :tangle ~/.flake/home/programs/core.nix :mkdirp yes + { config, pkgs, ... }: + + { + imports = [ + ./fastfetch.nix + ./foot.nix + ./git.nix + ./hyprlock.nix + ./ncmpcpp.nix + ./neovim.nix + ./ssh.nix + ./waybar.nix + ./zsh.nix + ]; + + home.packages = with pkgs; [ + discord # not FOSS + clang-tools + eza + fuzzel + ispell + gcc + gzdoom + htop + hyfetch + hyprshot + lesspipe + mpc-cli + mpv + networkmanagerapplet + obs-studio + pavucontrol + prismlauncher # minecraft + protonvpn-gui + python3 + swaybg + texliveFull + unzip + zip + ]; + } +#+end_src diff --git a/nixos/.flake/home/programs/core.org b/nixos/.flake/home/programs/core.org deleted file mode 100644 index 3bf0fab..0000000 --- a/nixos/.flake/home/programs/core.org +++ /dev/null @@ -1,46 +0,0 @@ -#+title: Core Program Configuration - -This is the core of my program configuration. This file installs programs that do not require additional configuration. Note that Discord is not FOSS and that =prismlauncher= is a launcher for Minecraft. -#+begin_src nix :tangle ~/.flake/home/programs/core.nix :mkdirp yes - { config, pkgs, ... }: - - { - imports = [ - ./fastfetch.nix - ./foot.nix - ./git.nix - ./hyprlock.nix - ./ncmpcpp.nix - ./neovim.nix - ./ssh.nix - ./waybar.nix - ./zsh.nix - ]; - - home.packages = with pkgs; [ - discord # not FOSS - clang-tools - eza - fuzzel - ispell - gcc - gzdoom - htop - hyfetch - hyprshot - lesspipe - mpc-cli - mpv - networkmanagerapplet - obs-studio - pavucontrol - prismlauncher # minecraft - protonvpn-gui - python3 - swaybg - texliveFull - unzip - zip - ]; - } -#+end_src diff --git a/nixos/.flake/home/programs/fastfetch.nix.org b/nixos/.flake/home/programs/fastfetch.nix.org new file mode 100644 index 0000000..96b2044 --- /dev/null +++ b/nixos/.flake/home/programs/fastfetch.nix.org @@ -0,0 +1,84 @@ +#+title: Fastfetch Configuration + +Specify the layout for =fastfetch=. +#+begin_src nix :tangle ~/.flake/home/programs/fastfetch.nix :mkdirp yes + { config, pkgs, ... }: + + { + programs.fastfetch = { + enable = true; + settings = { + logo = { + type = "raw"; + source = "~/.config/fastfetch/logo.sixel"; + width = 40; + height = 19; + }; + display = { + separator = " "; + }; + modules = [ + "title" + { + type = "custom"; + format = "──────────────────────────────────"; + } + { + type = "os"; + key = ""; + } + { + type = "kernel"; + key = "󰞸"; + } + { + type = "uptime"; + key = ""; + } + { + type = "packages"; + key = ""; + } + { + type = "shell"; + key = ""; + } + { + type = "display"; + key = "󰍹"; + } + { + type = "wm"; + key = ""; + } + { + type = "terminal"; + key = ""; + } + { + type = "cpu"; + key = ""; + } + { + type = "gpu"; + key = ""; + } + { + type = "memory"; + key = ""; + } + { + type = "disk"; + key = ""; + } + { + type = "locale"; + key = ""; + } + "break" + "colors" + ]; + }; + }; + } +#+end_src diff --git a/nixos/.flake/home/programs/fastfetch.org b/nixos/.flake/home/programs/fastfetch.org deleted file mode 100644 index 96b2044..0000000 --- a/nixos/.flake/home/programs/fastfetch.org +++ /dev/null @@ -1,84 +0,0 @@ -#+title: Fastfetch Configuration - -Specify the layout for =fastfetch=. -#+begin_src nix :tangle ~/.flake/home/programs/fastfetch.nix :mkdirp yes - { config, pkgs, ... }: - - { - programs.fastfetch = { - enable = true; - settings = { - logo = { - type = "raw"; - source = "~/.config/fastfetch/logo.sixel"; - width = 40; - height = 19; - }; - display = { - separator = " "; - }; - modules = [ - "title" - { - type = "custom"; - format = "──────────────────────────────────"; - } - { - type = "os"; - key = ""; - } - { - type = "kernel"; - key = "󰞸"; - } - { - type = "uptime"; - key = ""; - } - { - type = "packages"; - key = ""; - } - { - type = "shell"; - key = ""; - } - { - type = "display"; - key = "󰍹"; - } - { - type = "wm"; - key = ""; - } - { - type = "terminal"; - key = ""; - } - { - type = "cpu"; - key = ""; - } - { - type = "gpu"; - key = ""; - } - { - type = "memory"; - key = ""; - } - { - type = "disk"; - key = ""; - } - { - type = "locale"; - key = ""; - } - "break" - "colors" - ]; - }; - }; - } -#+end_src diff --git a/nixos/.flake/home/programs/foot.nix.org b/nixos/.flake/home/programs/foot.nix.org new file mode 100644 index 0000000..3490bed --- /dev/null +++ b/nixos/.flake/home/programs/foot.nix.org @@ -0,0 +1,42 @@ +#+title: Foot Terminal Configuration + +Specify my font and colour scheme for =foot=. +#+begin_src nix :tangle ~/.flake/home/programs/foot.nix :mkdirp yes +{ config, pkgs, ... }: + +{ + programs.foot = { + enable = true; + settings = { + main = { + font = "SauceCodePro Nerd Font:size=10"; + pad = "6x6"; + }; + mouse = { + hide-when-typing = "yes"; + }; + colors = { + alpha = "0.9"; + background = "ece0c9"; + foreground = "191916"; + regular0 = "191916"; + regular1 = "ac4438"; + regular2 = "354d52"; + regular3 = "ba9151"; + regular4 = "465b91"; + regular5 = "5b5489"; + regular6 = "4e6062"; + regular7 = "c9ad7a"; + bright0 = "293c3c"; + bright1 = "d8611c"; + bright2 = "4b7b53"; + bright3 = "d8974b"; + bright4 = "2f3d91"; + bright5 = "735e82"; + bright6 = "6b8f92"; + bright7 = "ece0c9"; + }; + }; + }; +} +#+end_src diff --git a/nixos/.flake/home/programs/foot.org b/nixos/.flake/home/programs/foot.org deleted file mode 100644 index 3490bed..0000000 --- a/nixos/.flake/home/programs/foot.org +++ /dev/null @@ -1,42 +0,0 @@ -#+title: Foot Terminal Configuration - -Specify my font and colour scheme for =foot=. -#+begin_src nix :tangle ~/.flake/home/programs/foot.nix :mkdirp yes -{ config, pkgs, ... }: - -{ - programs.foot = { - enable = true; - settings = { - main = { - font = "SauceCodePro Nerd Font:size=10"; - pad = "6x6"; - }; - mouse = { - hide-when-typing = "yes"; - }; - colors = { - alpha = "0.9"; - background = "ece0c9"; - foreground = "191916"; - regular0 = "191916"; - regular1 = "ac4438"; - regular2 = "354d52"; - regular3 = "ba9151"; - regular4 = "465b91"; - regular5 = "5b5489"; - regular6 = "4e6062"; - regular7 = "c9ad7a"; - bright0 = "293c3c"; - bright1 = "d8611c"; - bright2 = "4b7b53"; - bright3 = "d8974b"; - bright4 = "2f3d91"; - bright5 = "735e82"; - bright6 = "6b8f92"; - bright7 = "ece0c9"; - }; - }; - }; -} -#+end_src diff --git a/nixos/.flake/home/programs/git.nix.org b/nixos/.flake/home/programs/git.nix.org new file mode 100644 index 0000000..baf3aaa --- /dev/null +++ b/nixos/.flake/home/programs/git.nix.org @@ -0,0 +1,18 @@ +#+title: Git Configuration + +Specify my name and email for =git=. Also enable =delta= and =pull.rebase=. +#+begin_src nix :tangle ~/.flake/home/programs/git.nix :mkdirp yes +{ config, pkgs, ... }: + +{ + programs.git = { + enable = true; + userName = "Jacob Janzen"; + userEmail = "jacob.a.s.janzen@gmail.com"; + delta.enable = true; + extraConfig = { + pull.rebase = true; + }; + }; +} +#+end_src diff --git a/nixos/.flake/home/programs/git.org b/nixos/.flake/home/programs/git.org deleted file mode 100644 index baf3aaa..0000000 --- a/nixos/.flake/home/programs/git.org +++ /dev/null @@ -1,18 +0,0 @@ -#+title: Git Configuration - -Specify my name and email for =git=. Also enable =delta= and =pull.rebase=. -#+begin_src nix :tangle ~/.flake/home/programs/git.nix :mkdirp yes -{ config, pkgs, ... }: - -{ - programs.git = { - enable = true; - userName = "Jacob Janzen"; - userEmail = "jacob.a.s.janzen@gmail.com"; - delta.enable = true; - extraConfig = { - pull.rebase = true; - }; - }; -} -#+end_src diff --git a/nixos/.flake/home/programs/hyprlock.nix.org b/nixos/.flake/home/programs/hyprlock.nix.org new file mode 100644 index 0000000..4e94386 --- /dev/null +++ b/nixos/.flake/home/programs/hyprlock.nix.org @@ -0,0 +1,42 @@ +#+title: Hyprlock Configuration + +Place a textbox in the middle of the screen and use my blurred wallpaper as the background when locking. +#+begin_src nix :tangle ~/.flake/home/programs/hyprlock.nix :mkdirp yes + { config, pkgs, ... }: + + { + programs.hyprlock = { + enable = true; + settings = { + general = { + disable_loading_bar = true; + grace = 0; + hide_cursor = true; + no_fade_in = false; + }; + background = [ + { + path = "~/.wallpaper"; + blur_passes = 3; + blur_size = 8; + } + ]; + input-field = [ + { + size = "200, 50"; + position = "0, -80"; + monitor = ""; + dots_center = true; + fade_on_empty = false; + font_color = "rgb(202, 211, 245)"; + inner_color = "rgb(91, 96, 120)"; + outer_color = "rgb(24, 25, 38)"; + outline_thickness = 5; + placeholder_text = "Password..."; + shadow_passes = 2; + } + ]; + }; + }; + } +#+end_src diff --git a/nixos/.flake/home/programs/hyprlock.org b/nixos/.flake/home/programs/hyprlock.org deleted file mode 100644 index 4e94386..0000000 --- a/nixos/.flake/home/programs/hyprlock.org +++ /dev/null @@ -1,42 +0,0 @@ -#+title: Hyprlock Configuration - -Place a textbox in the middle of the screen and use my blurred wallpaper as the background when locking. -#+begin_src nix :tangle ~/.flake/home/programs/hyprlock.nix :mkdirp yes - { config, pkgs, ... }: - - { - programs.hyprlock = { - enable = true; - settings = { - general = { - disable_loading_bar = true; - grace = 0; - hide_cursor = true; - no_fade_in = false; - }; - background = [ - { - path = "~/.wallpaper"; - blur_passes = 3; - blur_size = 8; - } - ]; - input-field = [ - { - size = "200, 50"; - position = "0, -80"; - monitor = ""; - dots_center = true; - fade_on_empty = false; - font_color = "rgb(202, 211, 245)"; - inner_color = "rgb(91, 96, 120)"; - outer_color = "rgb(24, 25, 38)"; - outline_thickness = 5; - placeholder_text = "Password..."; - shadow_passes = 2; - } - ]; - }; - }; - } -#+end_src diff --git a/nixos/.flake/home/programs/ncmpcpp.nix.org b/nixos/.flake/home/programs/ncmpcpp.nix.org new file mode 100644 index 0000000..eb1f02f --- /dev/null +++ b/nixos/.flake/home/programs/ncmpcpp.nix.org @@ -0,0 +1,28 @@ +#+title: =ncmpcpp= Configuration + +Enable =vi=-like controls and specify directories and MPD address. +#+begin_src nix :tangle ~/.flake/home/programs/ncmpcpp.nix :mkdirp yes +{ config, pkgs, ... }: + +{ + programs.ncmpcpp = { + enable = true; + bindings = [ + { key = "j"; command = "scroll_down"; } + { key = "k"; command = "scroll_up"; } + { key = "h"; command = "previous_column"; } + { key = "l"; command = "next_column"; } + { key = "g"; command = "move_home"; } + { key = "G"; command = "move_end"; } + { key = "n"; command = "next_found_item"; } + { key = "N"; command = "previous_found_item"; } + ]; + mpdMusicDir = "~/Music"; + settings = { + ncmpcpp_directory = "~/.config/nmcpcpp"; + mpd_host = "localhost"; + mpd_port = "6600"; + }; + }; +} +#+end_src diff --git a/nixos/.flake/home/programs/ncmpcpp.org b/nixos/.flake/home/programs/ncmpcpp.org deleted file mode 100644 index eb1f02f..0000000 --- a/nixos/.flake/home/programs/ncmpcpp.org +++ /dev/null @@ -1,28 +0,0 @@ -#+title: =ncmpcpp= Configuration - -Enable =vi=-like controls and specify directories and MPD address. -#+begin_src nix :tangle ~/.flake/home/programs/ncmpcpp.nix :mkdirp yes -{ config, pkgs, ... }: - -{ - programs.ncmpcpp = { - enable = true; - bindings = [ - { key = "j"; command = "scroll_down"; } - { key = "k"; command = "scroll_up"; } - { key = "h"; command = "previous_column"; } - { key = "l"; command = "next_column"; } - { key = "g"; command = "move_home"; } - { key = "G"; command = "move_end"; } - { key = "n"; command = "next_found_item"; } - { key = "N"; command = "previous_found_item"; } - ]; - mpdMusicDir = "~/Music"; - settings = { - ncmpcpp_directory = "~/.config/nmcpcpp"; - mpd_host = "localhost"; - mpd_port = "6600"; - }; - }; -} -#+end_src diff --git a/nixos/.flake/home/programs/neovim.nix.org b/nixos/.flake/home/programs/neovim.nix.org new file mode 100644 index 0000000..350eded --- /dev/null +++ b/nixos/.flake/home/programs/neovim.nix.org @@ -0,0 +1,32 @@ +#+title: Neovim Settings + +Create a simple Neovim configuration. +#+begin_src nix :tangle ~/.flake/home/programs/neovim.nix :mkdirp yes + { config, pkgs, ... }: + + { + programs.neovim = { + enable = true; + + defaultEditor = true; + viAlias = true; + vimAlias = true; + plugins = with pkgs.vimPlugins; [ + vim-trailing-whitespace + lightline-vim + delimitMate + ]; + extraLuaConfig = '' + vim.opt.tabstop = 4 + vim.opt.expandtab = true + vim.opt.shiftwidth = 4 + vim.opt.autoindent = true + vim.opt.wildmode = 'longest,list' + vim.opt.number = true + vim.g.background = light + vim.cmd [[colorscheme default]] + vim.cmd [[set notermguicolors]] + ''; + }; + } +#+end_src diff --git a/nixos/.flake/home/programs/neovim.org b/nixos/.flake/home/programs/neovim.org deleted file mode 100644 index 350eded..0000000 --- a/nixos/.flake/home/programs/neovim.org +++ /dev/null @@ -1,32 +0,0 @@ -#+title: Neovim Settings - -Create a simple Neovim configuration. -#+begin_src nix :tangle ~/.flake/home/programs/neovim.nix :mkdirp yes - { config, pkgs, ... }: - - { - programs.neovim = { - enable = true; - - defaultEditor = true; - viAlias = true; - vimAlias = true; - plugins = with pkgs.vimPlugins; [ - vim-trailing-whitespace - lightline-vim - delimitMate - ]; - extraLuaConfig = '' - vim.opt.tabstop = 4 - vim.opt.expandtab = true - vim.opt.shiftwidth = 4 - vim.opt.autoindent = true - vim.opt.wildmode = 'longest,list' - vim.opt.number = true - vim.g.background = light - vim.cmd [[colorscheme default]] - vim.cmd [[set notermguicolors]] - ''; - }; - } -#+end_src diff --git a/nixos/.flake/home/programs/ssh.nix.org b/nixos/.flake/home/programs/ssh.nix.org new file mode 100644 index 0000000..a7502d2 --- /dev/null +++ b/nixos/.flake/home/programs/ssh.nix.org @@ -0,0 +1,13 @@ +#+title: SSH Configuration + +Add keys to SSH agent. +#+begin_src nix :tangle ~/.flake/home/programs/ssh.nix :mkdirp yes +{ config, pkgs, ... }: + +{ + programs.ssh = { + enable = true; + addKeysToAgent = "yes"; + }; +} +#+end_src diff --git a/nixos/.flake/home/programs/ssh.org b/nixos/.flake/home/programs/ssh.org deleted file mode 100644 index a7502d2..0000000 --- a/nixos/.flake/home/programs/ssh.org +++ /dev/null @@ -1,13 +0,0 @@ -#+title: SSH Configuration - -Add keys to SSH agent. -#+begin_src nix :tangle ~/.flake/home/programs/ssh.nix :mkdirp yes -{ config, pkgs, ... }: - -{ - programs.ssh = { - enable = true; - addKeysToAgent = "yes"; - }; -} -#+end_src diff --git a/nixos/.flake/home/programs/waybar.nix.org b/nixos/.flake/home/programs/waybar.nix.org new file mode 100644 index 0000000..7fe40f3 --- /dev/null +++ b/nixos/.flake/home/programs/waybar.nix.org @@ -0,0 +1,149 @@ +#+title: Waybar Configuration + +Show workspaces on the left, the current window in the centre, and MPD status, audio, cpu and memory status, clock, and system tray on the right. +#+begin_src nix :tangle ~/.flake/home/programs/waybar.nix :mkdirp yes + { config, pkgs, ... }: + + { + programs.waybar = { + enable = true; + settings = { + mainBar = { + height = 30; + spacing = 4; + modules-left = [ "hyprland/workspaces" ]; + modules-center = [ "hyprland/window" ]; + modules-right = [ "mpd" "pulseaudio" "cpu" "memory" "clock" "tray" ]; + mpd = { + format = "{stateIcon} {artist} - {album} - {title} ({elapsedTime:%M:%S}/{totalTime:%M:%S}) [{songPosition}|{queueLength}] 🎵"; + format-disconnected = "Disconnected 🎵"; + format-stopped = "{consumeIcon}Stopped 🎵"; + unknown-tag = "N/A"; + interval = 2; + state-icons = { + paused = ""; + playing = ""; + }; + tooltip-format = "MPD (connected)"; + tooltip-format-disconnected = "MPD (disconnected)"; + on-click = "foot -e ncmpcpp"; + }; + tray = { + icon-size = 21; + spacing = 10; + show-passive-items = true; + }; + clock = { + format = "{:%H:%M\t%Y-%m-%d}"; + }; + cpu = { + format = "{usage}% "; + tooltip = false; + }; + memory = { + format = "{}% "; + }; + network = { + format-wifi = ""; + tooltip = false; + format-ethernet = ""; + format-linked = ""; + format-disconnected = "⚠"; + on-click = "kcmshell5 kcm_networkmanagement"; + }; + pulseaudio = { + format = "{volume}% {icon}"; + format-bluetooth = "{volume}% {icon}"; + format-bluetooth-muted = " {icon}"; + format-muted = " "; + format-source = "{volume}% "; + format-source-muted = ""; + format-icons = { + headphone = ""; + hands-free = ""; + headset = ""; + phone = ""; + portable = ""; + car = ""; + default = ["" "" ""]; + }; + on-click = "pavucontrol"; + }; + }; + }; + style = '' + window#waybar { + font-family: FontAwesome, Roboto, Helvetica, Arial, sans-serif; + font-size: 13px; + background: transparent; + color: #ffffff; + text-shadow: 1px 1px #64727D; + transition-property: background-color; + transition-duration: .5s; + } + button { + border: none; + border-radius: 0; + } + button:hover { + background: inherit; + box-shadow: inset 0 -3px #ffffff; + } + #workspaces button { + padding: 0 5px; + text-shadow: 1px 1px #64727D; + background-color: transparent; + color: #ffffff; + } + #workspaces button:hover { + background: rgba(0, 0, 0, 0.2); + } + #workspaces button.focused { + background: transparent; + box-shadow: inset 0 -3px #ffffff; + } + #workspaces button.urgent { + background-color: #eb4d4b; + } + #clock, + #cpu, + #memory, + #disk, + #network, + #pulseaudio, + #wireplumber, + #custom-media, + #tray, + #mode, + #scratchpad, + #mpd { + padding: 0 10px; + } + #window, + #workspaces { + margin: 0 4px; + } + .modules-left > widget:first-child > #workspaces { + margin-left: 0; + } + + .modules-right > widget:last-child > #workspaces { + margin-right: 0; + } + #tray > .passive { + -gtk-icon-effect: dim; + } + #tray > .needs-attention { + -gtk-icon-effect: highlight; + } + #scratchpad { + background: rgba(0, 0, 0, 0.2); + } + + #scratchpad.empty { + background-color: transparent; + } + ''; + }; + } +#+end_src diff --git a/nixos/.flake/home/programs/waybar.org b/nixos/.flake/home/programs/waybar.org deleted file mode 100644 index 7fe40f3..0000000 --- a/nixos/.flake/home/programs/waybar.org +++ /dev/null @@ -1,149 +0,0 @@ -#+title: Waybar Configuration - -Show workspaces on the left, the current window in the centre, and MPD status, audio, cpu and memory status, clock, and system tray on the right. -#+begin_src nix :tangle ~/.flake/home/programs/waybar.nix :mkdirp yes - { config, pkgs, ... }: - - { - programs.waybar = { - enable = true; - settings = { - mainBar = { - height = 30; - spacing = 4; - modules-left = [ "hyprland/workspaces" ]; - modules-center = [ "hyprland/window" ]; - modules-right = [ "mpd" "pulseaudio" "cpu" "memory" "clock" "tray" ]; - mpd = { - format = "{stateIcon} {artist} - {album} - {title} ({elapsedTime:%M:%S}/{totalTime:%M:%S}) [{songPosition}|{queueLength}] 🎵"; - format-disconnected = "Disconnected 🎵"; - format-stopped = "{consumeIcon}Stopped 🎵"; - unknown-tag = "N/A"; - interval = 2; - state-icons = { - paused = ""; - playing = ""; - }; - tooltip-format = "MPD (connected)"; - tooltip-format-disconnected = "MPD (disconnected)"; - on-click = "foot -e ncmpcpp"; - }; - tray = { - icon-size = 21; - spacing = 10; - show-passive-items = true; - }; - clock = { - format = "{:%H:%M\t%Y-%m-%d}"; - }; - cpu = { - format = "{usage}% "; - tooltip = false; - }; - memory = { - format = "{}% "; - }; - network = { - format-wifi = ""; - tooltip = false; - format-ethernet = ""; - format-linked = ""; - format-disconnected = "⚠"; - on-click = "kcmshell5 kcm_networkmanagement"; - }; - pulseaudio = { - format = "{volume}% {icon}"; - format-bluetooth = "{volume}% {icon}"; - format-bluetooth-muted = " {icon}"; - format-muted = " "; - format-source = "{volume}% "; - format-source-muted = ""; - format-icons = { - headphone = ""; - hands-free = ""; - headset = ""; - phone = ""; - portable = ""; - car = ""; - default = ["" "" ""]; - }; - on-click = "pavucontrol"; - }; - }; - }; - style = '' - window#waybar { - font-family: FontAwesome, Roboto, Helvetica, Arial, sans-serif; - font-size: 13px; - background: transparent; - color: #ffffff; - text-shadow: 1px 1px #64727D; - transition-property: background-color; - transition-duration: .5s; - } - button { - border: none; - border-radius: 0; - } - button:hover { - background: inherit; - box-shadow: inset 0 -3px #ffffff; - } - #workspaces button { - padding: 0 5px; - text-shadow: 1px 1px #64727D; - background-color: transparent; - color: #ffffff; - } - #workspaces button:hover { - background: rgba(0, 0, 0, 0.2); - } - #workspaces button.focused { - background: transparent; - box-shadow: inset 0 -3px #ffffff; - } - #workspaces button.urgent { - background-color: #eb4d4b; - } - #clock, - #cpu, - #memory, - #disk, - #network, - #pulseaudio, - #wireplumber, - #custom-media, - #tray, - #mode, - #scratchpad, - #mpd { - padding: 0 10px; - } - #window, - #workspaces { - margin: 0 4px; - } - .modules-left > widget:first-child > #workspaces { - margin-left: 0; - } - - .modules-right > widget:last-child > #workspaces { - margin-right: 0; - } - #tray > .passive { - -gtk-icon-effect: dim; - } - #tray > .needs-attention { - -gtk-icon-effect: highlight; - } - #scratchpad { - background: rgba(0, 0, 0, 0.2); - } - - #scratchpad.empty { - background-color: transparent; - } - ''; - }; - } -#+end_src diff --git a/nixos/.flake/home/programs/zsh.nix.org b/nixos/.flake/home/programs/zsh.nix.org new file mode 100644 index 0000000..79795d0 --- /dev/null +++ b/nixos/.flake/home/programs/zsh.nix.org @@ -0,0 +1,87 @@ +#+title: ZSH Configuration + +Open =zsh= configuration. +#+begin_src nix :tangle ~/.flake/home/programs/zsh.nix :mkdirp yes + { config, pkgs, ... }: + + { + programs.zsh = { + enable = true; +#+end_src + +Automatically =cd= if only the path is used. +#+begin_src nix :tangle ~/.flake/home/programs/zsh.nix :mkdirp yes + autocd = true; +#+end_src + +Enable auto-suggestions. +#+begin_src nix :tangle ~/.flake/home/programs/zsh.nix :mkdirp yes + autosuggestion = { + enable = true; + }; +#+end_src + +Use =vi= keybindings. +#+begin_src nix :tangle ~/.flake/home/programs/zsh.nix :mkdirp yes + defaultKeymap = "viins"; +#+end_src + +Append to the history and ignore duplicates. +#+begin_src nix :tangle ~/.flake/home/programs/zsh.nix :mkdirp yes + history = { + append = true; + ignoreAllDups = true; + }; +#+end_src + +Specify =ls= aliases. +#+begin_src nix :tangle ~/.flake/home/programs/zsh.nix :mkdirp yes + shellAliases = { + "ll" = "ls -alF"; + "la" = "ls -a"; + "l" = "ls -F"; + "sl" = "ls"; + }; +#+end_src + +Enable syntax highlighting. +#+begin_src nix :tangle ~/.flake/home/programs/zsh.nix :mkdirp yes + syntaxHighlighting.enable = true; +#+end_src + +Create potential aliases and create the prompt. +#+begin_src nix :tangle ~/.flake/home/programs/zsh.nix :mkdirp yes + initExtra = '' + which lesspipe.sh &> /dev/null && export LESSOPEN="|lesspipe.sh %s" + which eza &> /dev/null && alias ls=eza + parse_git_dirty() { + git_status="$(git status 2> /dev/null)" + [[ "$git_status" =~ "use \"git push\" to publish your local commits" ]] && echo -n " %F{green}%f" + [[ "$git_status" =~ "Changes to be committed:" ]] && echo -n " %F{magenta}%f" + [[ "$git_status" =~ "Changes not staged for commit:" ]] && echo -n " %F{yellow}%f" + [[ "$git_status" =~ "Untracked files:" ]] && echo -n " %F{red}%f" + } + setopt prompt_subst + autoload -Uz vcs_info + precmd () { vcs_info } + zstyle ':vcs_info:*' formats ' %F{blue}%b%f' # git(main) + PS1='%(?..%B%F{red}[%?%\]%f%b )%F{green}%20<...<%~%<<%f$vcs_info_msg_0_$(parse_git_dirty) $ ' + ''; +#+end_src + +Launch =ssh-agent= at login. +#+begin_src nix :tangle ~/.flake/home/programs/zsh.nix :mkdirp yes + profileExtra = '' + if [ ! -S ~/.ssh/ssh_auth_sock ]; then + eval `ssh-agent` > /dev/null + ln -sf "$SSH_AUTH_SOCK" ~/.ssh/ssh_auth_sock + fi + export SSH_AUTH_SOCK=~/.ssh/ssh_auth_sock + ''; +#+end_src + +Close =zsh= configuration. +#+begin_src nix :tangle ~/.flake/home/programs/zsh.nix :mkdirp yes + }; + } +#+end_src diff --git a/nixos/.flake/home/programs/zsh.org b/nixos/.flake/home/programs/zsh.org deleted file mode 100644 index 79795d0..0000000 --- a/nixos/.flake/home/programs/zsh.org +++ /dev/null @@ -1,87 +0,0 @@ -#+title: ZSH Configuration - -Open =zsh= configuration. -#+begin_src nix :tangle ~/.flake/home/programs/zsh.nix :mkdirp yes - { config, pkgs, ... }: - - { - programs.zsh = { - enable = true; -#+end_src - -Automatically =cd= if only the path is used. -#+begin_src nix :tangle ~/.flake/home/programs/zsh.nix :mkdirp yes - autocd = true; -#+end_src - -Enable auto-suggestions. -#+begin_src nix :tangle ~/.flake/home/programs/zsh.nix :mkdirp yes - autosuggestion = { - enable = true; - }; -#+end_src - -Use =vi= keybindings. -#+begin_src nix :tangle ~/.flake/home/programs/zsh.nix :mkdirp yes - defaultKeymap = "viins"; -#+end_src - -Append to the history and ignore duplicates. -#+begin_src nix :tangle ~/.flake/home/programs/zsh.nix :mkdirp yes - history = { - append = true; - ignoreAllDups = true; - }; -#+end_src - -Specify =ls= aliases. -#+begin_src nix :tangle ~/.flake/home/programs/zsh.nix :mkdirp yes - shellAliases = { - "ll" = "ls -alF"; - "la" = "ls -a"; - "l" = "ls -F"; - "sl" = "ls"; - }; -#+end_src - -Enable syntax highlighting. -#+begin_src nix :tangle ~/.flake/home/programs/zsh.nix :mkdirp yes - syntaxHighlighting.enable = true; -#+end_src - -Create potential aliases and create the prompt. -#+begin_src nix :tangle ~/.flake/home/programs/zsh.nix :mkdirp yes - initExtra = '' - which lesspipe.sh &> /dev/null && export LESSOPEN="|lesspipe.sh %s" - which eza &> /dev/null && alias ls=eza - parse_git_dirty() { - git_status="$(git status 2> /dev/null)" - [[ "$git_status" =~ "use \"git push\" to publish your local commits" ]] && echo -n " %F{green}%f" - [[ "$git_status" =~ "Changes to be committed:" ]] && echo -n " %F{magenta}%f" - [[ "$git_status" =~ "Changes not staged for commit:" ]] && echo -n " %F{yellow}%f" - [[ "$git_status" =~ "Untracked files:" ]] && echo -n " %F{red}%f" - } - setopt prompt_subst - autoload -Uz vcs_info - precmd () { vcs_info } - zstyle ':vcs_info:*' formats ' %F{blue}%b%f' # git(main) - PS1='%(?..%B%F{red}[%?%\]%f%b )%F{green}%20<...<%~%<<%f$vcs_info_msg_0_$(parse_git_dirty) $ ' - ''; -#+end_src - -Launch =ssh-agent= at login. -#+begin_src nix :tangle ~/.flake/home/programs/zsh.nix :mkdirp yes - profileExtra = '' - if [ ! -S ~/.ssh/ssh_auth_sock ]; then - eval `ssh-agent` > /dev/null - ln -sf "$SSH_AUTH_SOCK" ~/.ssh/ssh_auth_sock - fi - export SSH_AUTH_SOCK=~/.ssh/ssh_auth_sock - ''; -#+end_src - -Close =zsh= configuration. -#+begin_src nix :tangle ~/.flake/home/programs/zsh.nix :mkdirp yes - }; - } -#+end_src diff --git a/nixos/.flake/home/scripts.nix.org b/nixos/.flake/home/scripts.nix.org new file mode 100644 index 0000000..b98b389 --- /dev/null +++ b/nixos/.flake/home/scripts.nix.org @@ -0,0 +1,43 @@ +#+title: Custom Scripts + +Open script container. +#+begin_src nix :tangle ~/.flake/home/scripts.nix :mkdirp yes + { config, pkgs, ... }: + + { + home.file = { +#+end_src + +Use =fuzzel= to open a menu to power off, reboot, or log out. +#+begin_src nix :tangle ~/.flake/home/scripts.nix :mkdirp yes + ".local/bin/poweroptions.sh" = { + text = '' + #!/bin/sh + + getoption () { + fuzzel --dmenu -l 3 -x 1 -r 10 << EOF + 󰐥 power off + 󰜉 restart + 󰍃 logout + EOF + } + + option=$(getoption | xargs) + case $option in + '󰐥 power off') + systemctl poweroff;; + '󰜉 restart') + systemctl reboot;; + '󰍃 logout') + hyprctl dispatch exit;; + esac + ''; + executable = true; + }; +#+end_src + +Close script container. +#+begin_src nix :tangle ~/.flake/home/scripts.nix :mkdirp yes + }; + } +#+end_src diff --git a/nixos/.flake/home/scripts.org b/nixos/.flake/home/scripts.org deleted file mode 100644 index b98b389..0000000 --- a/nixos/.flake/home/scripts.org +++ /dev/null @@ -1,43 +0,0 @@ -#+title: Custom Scripts - -Open script container. -#+begin_src nix :tangle ~/.flake/home/scripts.nix :mkdirp yes - { config, pkgs, ... }: - - { - home.file = { -#+end_src - -Use =fuzzel= to open a menu to power off, reboot, or log out. -#+begin_src nix :tangle ~/.flake/home/scripts.nix :mkdirp yes - ".local/bin/poweroptions.sh" = { - text = '' - #!/bin/sh - - getoption () { - fuzzel --dmenu -l 3 -x 1 -r 10 << EOF - 󰐥 power off - 󰜉 restart - 󰍃 logout - EOF - } - - option=$(getoption | xargs) - case $option in - '󰐥 power off') - systemctl poweroff;; - '󰜉 restart') - systemctl reboot;; - '󰍃 logout') - hyprctl dispatch exit;; - esac - ''; - executable = true; - }; -#+end_src - -Close script container. -#+begin_src nix :tangle ~/.flake/home/scripts.nix :mkdirp yes - }; - } -#+end_src diff --git a/nixos/.flake/home/services/core.nix.org b/nixos/.flake/home/services/core.nix.org new file mode 100644 index 0000000..bd4c1d2 --- /dev/null +++ b/nixos/.flake/home/services/core.nix.org @@ -0,0 +1,19 @@ +#+title: Core Service Configuration + +Import service configurations. +#+begin_src nix :tangle ~/.flake/home/services/core.nix :mkdirp yes +{ config, pkgs, ... }: + +{ + imports = [ + ./emacs.nix + ./mako.nix + ./mpd.nix + ./syncthing.nix + ]; + + home.packages = with pkgs; [ + mpdscribble + ]; +} +#+end_src diff --git a/nixos/.flake/home/services/core.org b/nixos/.flake/home/services/core.org deleted file mode 100644 index bd4c1d2..0000000 --- a/nixos/.flake/home/services/core.org +++ /dev/null @@ -1,19 +0,0 @@ -#+title: Core Service Configuration - -Import service configurations. -#+begin_src nix :tangle ~/.flake/home/services/core.nix :mkdirp yes -{ config, pkgs, ... }: - -{ - imports = [ - ./emacs.nix - ./mako.nix - ./mpd.nix - ./syncthing.nix - ]; - - home.packages = with pkgs; [ - mpdscribble - ]; -} -#+end_src diff --git a/nixos/.flake/home/services/emacs.nix.org b/nixos/.flake/home/services/emacs.nix.org new file mode 100644 index 0000000..1a11446 --- /dev/null +++ b/nixos/.flake/home/services/emacs.nix.org @@ -0,0 +1,14 @@ +#+title: Emacs Service Configuration + +Enable Emacs daemon and client. +#+begin_src nix :tangle ~/.flake/home/services/emacs.nix :mkdirp yes +{ config, pkgs, ... }: + +{ + services.emacs = { + enable = true; + client.enable = true; + socketActivation.enable = true; + }; +} +#+end_src diff --git a/nixos/.flake/home/services/emacs.org b/nixos/.flake/home/services/emacs.org deleted file mode 100644 index 1a11446..0000000 --- a/nixos/.flake/home/services/emacs.org +++ /dev/null @@ -1,14 +0,0 @@ -#+title: Emacs Service Configuration - -Enable Emacs daemon and client. -#+begin_src nix :tangle ~/.flake/home/services/emacs.nix :mkdirp yes -{ config, pkgs, ... }: - -{ - services.emacs = { - enable = true; - client.enable = true; - socketActivation.enable = true; - }; -} -#+end_src diff --git a/nixos/.flake/home/services/mako.nix.org b/nixos/.flake/home/services/mako.nix.org new file mode 100644 index 0000000..caa0240 --- /dev/null +++ b/nixos/.flake/home/services/mako.nix.org @@ -0,0 +1,13 @@ +#+title: Mako Configuration + +Enable =mako= to handle notifications. +#+begin_src nix :tangle ~/.flake/home/services/mako.nix :mkdirp yes +{ config, pkgs, ... }: + +{ + services.mako = { + enable = true; + backgroundColor = "#191916ff"; + }; +} +#+end_src diff --git a/nixos/.flake/home/services/mako.org b/nixos/.flake/home/services/mako.org deleted file mode 100644 index caa0240..0000000 --- a/nixos/.flake/home/services/mako.org +++ /dev/null @@ -1,13 +0,0 @@ -#+title: Mako Configuration - -Enable =mako= to handle notifications. -#+begin_src nix :tangle ~/.flake/home/services/mako.nix :mkdirp yes -{ config, pkgs, ... }: - -{ - services.mako = { - enable = true; - backgroundColor = "#191916ff"; - }; -} -#+end_src diff --git a/nixos/.flake/home/services/mpd.nix.org b/nixos/.flake/home/services/mpd.nix.org new file mode 100644 index 0000000..b985b2a --- /dev/null +++ b/nixos/.flake/home/services/mpd.nix.org @@ -0,0 +1,21 @@ +#+title: MPD Configuration + +Set music directory and enable PipeWire output. +#+begin_src nix :tangle ~/.flake/home/services/mpd.nix :mkdirp yes + { config, pkgs, ... }: + + { + services.mpd = { + enable = true; + musicDirectory = "~/Music"; + extraConfig = '' + audio_output { + type "pipewire" + name "Pipewire" + mixer_type "hardware" + enabled "yes" + } + ''; + }; + } +#+end_src diff --git a/nixos/.flake/home/services/mpd.org b/nixos/.flake/home/services/mpd.org deleted file mode 100644 index b985b2a..0000000 --- a/nixos/.flake/home/services/mpd.org +++ /dev/null @@ -1,21 +0,0 @@ -#+title: MPD Configuration - -Set music directory and enable PipeWire output. -#+begin_src nix :tangle ~/.flake/home/services/mpd.nix :mkdirp yes - { config, pkgs, ... }: - - { - services.mpd = { - enable = true; - musicDirectory = "~/Music"; - extraConfig = '' - audio_output { - type "pipewire" - name "Pipewire" - mixer_type "hardware" - enabled "yes" - } - ''; - }; - } -#+end_src diff --git a/nixos/.flake/home/services/syncthing.nix.org b/nixos/.flake/home/services/syncthing.nix.org new file mode 100644 index 0000000..42dbf50 --- /dev/null +++ b/nixos/.flake/home/services/syncthing.nix.org @@ -0,0 +1,12 @@ +#+title: Syncthing Configuration + +Enable Syncthing service. +#+begin_src nix :tangle ~/.flake/home/services/syncthing.nix :mkdirp yes +{ config, pkgs, ... }: + +{ + services.syncthing = { + enable = true; + }; +} +#+end_src diff --git a/nixos/.flake/home/services/syncthing.org b/nixos/.flake/home/services/syncthing.org deleted file mode 100644 index 42dbf50..0000000 --- a/nixos/.flake/home/services/syncthing.org +++ /dev/null @@ -1,12 +0,0 @@ -#+title: Syncthing Configuration - -Enable Syncthing service. -#+begin_src nix :tangle ~/.flake/home/services/syncthing.nix :mkdirp yes -{ config, pkgs, ... }: - -{ - services.syncthing = { - enable = true; - }; -} -#+end_src diff --git a/nixos/.flake/system/boot.nix.org b/nixos/.flake/system/boot.nix.org new file mode 100644 index 0000000..fe98542 --- /dev/null +++ b/nixos/.flake/system/boot.nix.org @@ -0,0 +1,11 @@ +#+title: Boot Configuration + +Enable =systemd-boot= as my boot loader. +#+begin_src nix :tangle ~/.flake/system/boot.nix :mkdirp yes +{ config, lib, pkgs, ... }: + +{ + boot.loader.systemd-boot.enable = true; + boot.loader.efi.canTouchEfiVariables = true; +} +#+end_src diff --git a/nixos/.flake/system/boot.org b/nixos/.flake/system/boot.org deleted file mode 100644 index fe98542..0000000 --- a/nixos/.flake/system/boot.org +++ /dev/null @@ -1,11 +0,0 @@ -#+title: Boot Configuration - -Enable =systemd-boot= as my boot loader. -#+begin_src nix :tangle ~/.flake/system/boot.nix :mkdirp yes -{ config, lib, pkgs, ... }: - -{ - boot.loader.systemd-boot.enable = true; - boot.loader.efi.canTouchEfiVariables = true; -} -#+end_src diff --git a/nixos/.flake/system/core.nix.org b/nixos/.flake/system/core.nix.org new file mode 100644 index 0000000..e909198 --- /dev/null +++ b/nixos/.flake/system/core.nix.org @@ -0,0 +1,21 @@ +#+title: System Core + +This file imports various system configuration components in addition to enabling flakes and defining the system version. +#+begin_src nix :tangle ~/.flake/system/core.nix :mkdirp yes +{ config, lib, pkgs, ... }: + +{ + imports = [ + ./boot.nix + ./desktop.nix + ./hardware-configuration.nix + ./locale.nix + ./network.nix + ./users.nix + ]; + + nix.settings.experimental-features = [ "nix-command" "flakes" ]; + + system.stateVersion = "24.05"; +} +#+end_src diff --git a/nixos/.flake/system/core.org b/nixos/.flake/system/core.org deleted file mode 100644 index e909198..0000000 --- a/nixos/.flake/system/core.org +++ /dev/null @@ -1,21 +0,0 @@ -#+title: System Core - -This file imports various system configuration components in addition to enabling flakes and defining the system version. -#+begin_src nix :tangle ~/.flake/system/core.nix :mkdirp yes -{ config, lib, pkgs, ... }: - -{ - imports = [ - ./boot.nix - ./desktop.nix - ./hardware-configuration.nix - ./locale.nix - ./network.nix - ./users.nix - ]; - - nix.settings.experimental-features = [ "nix-command" "flakes" ]; - - system.stateVersion = "24.05"; -} -#+end_src diff --git a/nixos/.flake/system/desktop.nix.org b/nixos/.flake/system/desktop.nix.org new file mode 100644 index 0000000..fbe4206 --- /dev/null +++ b/nixos/.flake/system/desktop.nix.org @@ -0,0 +1,108 @@ +#+title: Desktop System Configuration + +Open the desktop configuration. +#+begin_src nix :tangle ~/.flake/system/desktop.nix :mkdirp yes + { config, lib, pkgs, ... }: + + { +#+end_src + +Allow unfree packages on this system. +#+begin_src nix :tangle ~/.flake/system/desktop.nix :mkdirp yes + nixpkgs.config.allowUnfree = true; +#+end_src + +Install necessary packages for the desktop. +#+begin_src nix :tangle ~/.flake/system/desktop.nix :mkdirp yes + environment.systemPackages = with pkgs; [ + dolphin + firefox + git + greetd.tuigreet + kitty + neovim + wget + ]; +#+end_src + +Install Steam. +#+begin_src nix :tangle ~/.flake/system/desktop.nix :mkdirp yes + programs.steam = { + enable = true; + remotePlay.openFirewall = true; + dedicatedServer.openFirewall = true; + localNetworkGameTransfers.openFirewall = true; + }; +#+end_src + +Use Neovim as my default editor. +#+begin_src nix :tangle ~/.flake/system/desktop.nix :mkdirp yes + environment.variables.EDITOR = "nvim"; +#+end_src + +Enable GPG agent globally. +#+begin_src nix :tangle ~/.flake/system/desktop.nix :mkdirp yes + programs.gnupg.agent = { + enable = true; + enableSSHSupport = true; + }; +#+end_src + +Install =zsh= and set up completions. +#+begin_src nix :tangle ~/.flake/system/desktop.nix :mkdirp yes + programs.zsh.enable = true; + environment.pathsToLink = [ "/share/zsh" ]; +#+end_src + +Use the =us= keyboard layout. +#+begin_src nix :tangle ~/.flake/system/desktop.nix :mkdirp yes + services.xserver.xkb.layout = "us"; +#+end_src + +Install Hyprland as a window manager. +#+begin_src nix :tangle ~/.flake/system/desktop.nix :mkdirp yes + services.xserver.enable = true; + xdg.portal.enable = true; + programs.hyprland.enable = true; + environment.sessionVariables.NIXOS_OZONE_WL = "1"; +#+end_src + +Enable =pam= support for Hyprlock. +#+begin_src nix :tangle ~/.flake/system/desktop.nix :mkdirp yes + security.pam.services.hyprlock = {}; +#+end_src + +Enable =greetd= with =tuigreet= as my login manager. +#+begin_src nix :tangle ~/.flake/system/desktop.nix :mkdirp yes + services.greetd = { + enable = true; + settings = { + default_session = { + command = "${pkgs.greetd.tuigreet}/bin/tuigreet --time --remember --remember-session --sessions ${pkgs.hyprland}/share/wayland-sessions --cmd \"dbus-run-session Hyprland\""; + user = "greeter"; + }; + }; + }; + systemd.services.greetd.serviceConfig = { + Type = "idle"; + StandardInput = "tty"; + StanardOutput = "tty"; + StandardError = "journal"; + TTYReset = true; + TTYVHangup = true; + TTYVTDisallocate = true; + }; +#+end_src + +Enable PipeWire. +#+begin_src nix :tangle ~/.flake/system/desktop.nix :mkdirp yes + services.pipewire = { + enable = true; + pulse.enable = true; + }; +#+end_src + +Close the desktop configuration. +#+begin_src nix :tangle ~/.flake/system/desktop.nix :mkdirp yes + } +#+end_src diff --git a/nixos/.flake/system/desktop.org b/nixos/.flake/system/desktop.org deleted file mode 100644 index fbe4206..0000000 --- a/nixos/.flake/system/desktop.org +++ /dev/null @@ -1,108 +0,0 @@ -#+title: Desktop System Configuration - -Open the desktop configuration. -#+begin_src nix :tangle ~/.flake/system/desktop.nix :mkdirp yes - { config, lib, pkgs, ... }: - - { -#+end_src - -Allow unfree packages on this system. -#+begin_src nix :tangle ~/.flake/system/desktop.nix :mkdirp yes - nixpkgs.config.allowUnfree = true; -#+end_src - -Install necessary packages for the desktop. -#+begin_src nix :tangle ~/.flake/system/desktop.nix :mkdirp yes - environment.systemPackages = with pkgs; [ - dolphin - firefox - git - greetd.tuigreet - kitty - neovim - wget - ]; -#+end_src - -Install Steam. -#+begin_src nix :tangle ~/.flake/system/desktop.nix :mkdirp yes - programs.steam = { - enable = true; - remotePlay.openFirewall = true; - dedicatedServer.openFirewall = true; - localNetworkGameTransfers.openFirewall = true; - }; -#+end_src - -Use Neovim as my default editor. -#+begin_src nix :tangle ~/.flake/system/desktop.nix :mkdirp yes - environment.variables.EDITOR = "nvim"; -#+end_src - -Enable GPG agent globally. -#+begin_src nix :tangle ~/.flake/system/desktop.nix :mkdirp yes - programs.gnupg.agent = { - enable = true; - enableSSHSupport = true; - }; -#+end_src - -Install =zsh= and set up completions. -#+begin_src nix :tangle ~/.flake/system/desktop.nix :mkdirp yes - programs.zsh.enable = true; - environment.pathsToLink = [ "/share/zsh" ]; -#+end_src - -Use the =us= keyboard layout. -#+begin_src nix :tangle ~/.flake/system/desktop.nix :mkdirp yes - services.xserver.xkb.layout = "us"; -#+end_src - -Install Hyprland as a window manager. -#+begin_src nix :tangle ~/.flake/system/desktop.nix :mkdirp yes - services.xserver.enable = true; - xdg.portal.enable = true; - programs.hyprland.enable = true; - environment.sessionVariables.NIXOS_OZONE_WL = "1"; -#+end_src - -Enable =pam= support for Hyprlock. -#+begin_src nix :tangle ~/.flake/system/desktop.nix :mkdirp yes - security.pam.services.hyprlock = {}; -#+end_src - -Enable =greetd= with =tuigreet= as my login manager. -#+begin_src nix :tangle ~/.flake/system/desktop.nix :mkdirp yes - services.greetd = { - enable = true; - settings = { - default_session = { - command = "${pkgs.greetd.tuigreet}/bin/tuigreet --time --remember --remember-session --sessions ${pkgs.hyprland}/share/wayland-sessions --cmd \"dbus-run-session Hyprland\""; - user = "greeter"; - }; - }; - }; - systemd.services.greetd.serviceConfig = { - Type = "idle"; - StandardInput = "tty"; - StanardOutput = "tty"; - StandardError = "journal"; - TTYReset = true; - TTYVHangup = true; - TTYVTDisallocate = true; - }; -#+end_src - -Enable PipeWire. -#+begin_src nix :tangle ~/.flake/system/desktop.nix :mkdirp yes - services.pipewire = { - enable = true; - pulse.enable = true; - }; -#+end_src - -Close the desktop configuration. -#+begin_src nix :tangle ~/.flake/system/desktop.nix :mkdirp yes - } -#+end_src diff --git a/nixos/.flake/system/locale.nix.org b/nixos/.flake/system/locale.nix.org new file mode 100644 index 0000000..63d05a0 --- /dev/null +++ b/nixos/.flake/system/locale.nix.org @@ -0,0 +1,11 @@ +#+title: Locale Setup + +My timezone is Winnipeg, and I use Canadian English. +#+begin_src nix :tangle ~/.flake/system/locale.nix :mkdirp yes + { config, lib, pkgs, ... }: + + { + time.timeZone = "America/Winnipeg"; + i18n.defaultLocale = "en_CA.UTF-8"; + } +#+end_src diff --git a/nixos/.flake/system/locale.org b/nixos/.flake/system/locale.org deleted file mode 100644 index 63d05a0..0000000 --- a/nixos/.flake/system/locale.org +++ /dev/null @@ -1,11 +0,0 @@ -#+title: Locale Setup - -My timezone is Winnipeg, and I use Canadian English. -#+begin_src nix :tangle ~/.flake/system/locale.nix :mkdirp yes - { config, lib, pkgs, ... }: - - { - time.timeZone = "America/Winnipeg"; - i18n.defaultLocale = "en_CA.UTF-8"; - } -#+end_src diff --git a/nixos/.flake/system/network.nix.org b/nixos/.flake/system/network.nix.org new file mode 100644 index 0000000..06a0251 --- /dev/null +++ b/nixos/.flake/system/network.nix.org @@ -0,0 +1,48 @@ +#+title: Network Configuration + +Open the network configuration. +#+begin_src nix :tangle ~/.flake/system/network.nix :mkdirp yes + { config, lib, pkgs, ... }: + + { +#+end_src + +This system is called =nixos=. +#+begin_src nix :tangle ~/.flake/system/network.nix :mkdirp yes + networking.hostName = "nixos"; +#+end_src + +I use NetworkManager to configure my network. +#+begin_src nix :tangle ~/.flake/system/network.nix :mkdirp yes + networking.networkmanager.enable = true; +#+end_src + +Enable Bluetooth at boot. +#+begin_src nix :tangle ~/.flake/system/network.nix :mkdirp yes + hardware.bluetooth.enable = true; + hardware.bluetooth.powerOnBoot = true; + services.blueman.enable = true; +#+end_src + +Enable printing. +#+begin_src nix :tangle ~/.flake/system/network.nix :mkdirp yes + services.printing.enable = true; +#+end_src + +Enable SSH. +#+begin_src nix :tangle ~/.flake/system/network.nix :mkdirp yes + services.openssh.enable = true; +#+end_src + +Set up my firewall. +#+begin_src nix :tangle ~/.flake/system/network.nix :mkdirp yes + networking.firewall = { + allowedTCPPorts = [ ]; + allowedUDPPorts = [ ]; + }; +#+end_src + +Close the network configuration. +#+begin_src nix :tangle ~/.flake/system/network.nix :mkdirp yes + } +#+end_src diff --git a/nixos/.flake/system/network.org b/nixos/.flake/system/network.org deleted file mode 100644 index 06a0251..0000000 --- a/nixos/.flake/system/network.org +++ /dev/null @@ -1,48 +0,0 @@ -#+title: Network Configuration - -Open the network configuration. -#+begin_src nix :tangle ~/.flake/system/network.nix :mkdirp yes - { config, lib, pkgs, ... }: - - { -#+end_src - -This system is called =nixos=. -#+begin_src nix :tangle ~/.flake/system/network.nix :mkdirp yes - networking.hostName = "nixos"; -#+end_src - -I use NetworkManager to configure my network. -#+begin_src nix :tangle ~/.flake/system/network.nix :mkdirp yes - networking.networkmanager.enable = true; -#+end_src - -Enable Bluetooth at boot. -#+begin_src nix :tangle ~/.flake/system/network.nix :mkdirp yes - hardware.bluetooth.enable = true; - hardware.bluetooth.powerOnBoot = true; - services.blueman.enable = true; -#+end_src - -Enable printing. -#+begin_src nix :tangle ~/.flake/system/network.nix :mkdirp yes - services.printing.enable = true; -#+end_src - -Enable SSH. -#+begin_src nix :tangle ~/.flake/system/network.nix :mkdirp yes - services.openssh.enable = true; -#+end_src - -Set up my firewall. -#+begin_src nix :tangle ~/.flake/system/network.nix :mkdirp yes - networking.firewall = { - allowedTCPPorts = [ ]; - allowedUDPPorts = [ ]; - }; -#+end_src - -Close the network configuration. -#+begin_src nix :tangle ~/.flake/system/network.nix :mkdirp yes - } -#+end_src diff --git a/nixos/.flake/system/users.nix.org b/nixos/.flake/system/users.nix.org new file mode 100644 index 0000000..498857a --- /dev/null +++ b/nixos/.flake/system/users.nix.org @@ -0,0 +1,14 @@ +#+title: User Configuration + +Set up my user account with =zsh= as default shell with =sudoers= and network management permissions. +#+begin_src nix :tangle ~/.flake/system/users.nix :mkdirp yes +{ config, lib, pkgs, ... }: + +{ + users.users.jane = { + shell = pkgs.zsh; + isNormalUser = true; + extraGroups = [ "networkmanager" "wheel" ]; + }; +} +#+end_src diff --git a/nixos/.flake/system/users.org b/nixos/.flake/system/users.org deleted file mode 100644 index 498857a..0000000 --- a/nixos/.flake/system/users.org +++ /dev/null @@ -1,14 +0,0 @@ -#+title: User Configuration - -Set up my user account with =zsh= as default shell with =sudoers= and network management permissions. -#+begin_src nix :tangle ~/.flake/system/users.nix :mkdirp yes -{ config, lib, pkgs, ... }: - -{ - users.users.jane = { - shell = pkgs.zsh; - isNormalUser = true; - extraGroups = [ "networkmanager" "wheel" ]; - }; -} -#+end_src -- cgit v1.2.3