aboutsummaryrefslogtreecommitdiff
path: root/nixos
diff options
context:
space:
mode:
Diffstat (limited to 'nixos')
-rw-r--r--nixos/.flake/flake.nix29
-rw-r--r--nixos/.flake/flake.org34
-rw-r--r--nixos/.flake/home/core.nix17
-rw-r--r--nixos/.flake/home/core.org22
-rw-r--r--nixos/.flake/home/cursor.org (renamed from nixos/.flake/home/cursor.nix)5
-rw-r--r--nixos/.flake/home/fonts.org (renamed from nixos/.flake/home/fonts.nix)5
-rw-r--r--nixos/.flake/home/hyprland.nix121
-rw-r--r--nixos/.flake/home/hyprland.org175
-rw-r--r--nixos/.flake/home/programs/core.nix32
-rw-r--r--nixos/.flake/home/programs/core.org39
-rw-r--r--nixos/.flake/home/programs/fastfetch.nix79
-rw-r--r--nixos/.flake/home/programs/fastfetch.org84
-rw-r--r--nixos/.flake/home/programs/foot.org (renamed from nixos/.flake/home/programs/foot.nix)5
-rw-r--r--nixos/.flake/home/programs/git.nix9
-rw-r--r--nixos/.flake/home/programs/git.org18
-rw-r--r--nixos/.flake/home/programs/hyprlock.nix37
-rw-r--r--nixos/.flake/home/programs/hyprlock.org42
-rw-r--r--nixos/.flake/home/programs/ncmpcpp.org (renamed from nixos/.flake/home/programs/ncmpcpp.nix)5
-rw-r--r--nixos/.flake/home/programs/ssh.nix8
-rw-r--r--nixos/.flake/home/programs/ssh.org13
-rw-r--r--nixos/.flake/home/programs/waybar.nix145
-rw-r--r--nixos/.flake/home/programs/waybar.org149
-rw-r--r--nixos/.flake/home/programs/zsh.nix47
-rw-r--r--nixos/.flake/home/programs/zsh.org88
-rw-r--r--nixos/.flake/home/services/core.org (renamed from nixos/.flake/home/services/core.nix)5
-rw-r--r--nixos/.flake/home/services/emacs.nix9
-rw-r--r--nixos/.flake/home/services/emacs.org14
-rw-r--r--nixos/.flake/home/services/mako.nix8
-rw-r--r--nixos/.flake/home/services/mako.org13
-rw-r--r--nixos/.flake/home/services/mpd.nix16
-rw-r--r--nixos/.flake/home/services/mpd.org21
-rw-r--r--nixos/.flake/home/services/syncthing.nix7
-rw-r--r--nixos/.flake/home/services/syncthing.org12
-rw-r--r--nixos/.flake/system/boot.nix6
-rw-r--r--nixos/.flake/system/boot.org11
-rw-r--r--nixos/.flake/system/core.org (renamed from nixos/.flake/system/core.nix)7
-rw-r--r--nixos/.flake/system/desktop.nix54
-rw-r--r--nixos/.flake/system/desktop.org103
-rw-r--r--nixos/.flake/system/locale.nix6
-rw-r--r--nixos/.flake/system/locale.org11
-rw-r--r--nixos/.flake/system/network.nix15
-rw-r--r--nixos/.flake/system/network.org48
-rw-r--r--nixos/.flake/system/users.nix9
-rw-r--r--nixos/.flake/system/users.org14
44 files changed, 940 insertions, 657 deletions
diff --git a/nixos/.flake/flake.nix b/nixos/.flake/flake.nix
deleted file mode 100644
index e75cffd..0000000
--- a/nixos/.flake/flake.nix
+++ /dev/null
@@ -1,29 +0,0 @@
-{
- 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;
- }
- ];
- };
- };
-}
diff --git a/nixos/.flake/flake.org b/nixos/.flake/flake.org
new file mode 100644
index 0000000..1e3c71b
--- /dev/null
+++ b/nixos/.flake/flake.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/home/core.nix b/nixos/.flake/home/core.nix
deleted file mode 100644
index cfba834..0000000
--- a/nixos/.flake/home/core.nix
+++ /dev/null
@@ -1,17 +0,0 @@
-{ config, pkgs, ... }:
-
-{
- imports = [
- ./cursor.nix
- ./fonts.nix
- ./hyprland.nix
- ./programs/core.nix
- ./services/core.nix
- ];
-
- home.username = "jane";
- home.homeDirectory = "/home/jane";
-
- home.stateVersion = "24.05";
- programs.home-manager.enable = true;
-}
diff --git a/nixos/.flake/home/core.org b/nixos/.flake/home/core.org
new file mode 100644
index 0000000..af108cf
--- /dev/null
+++ b/nixos/.flake/home/core.org
@@ -0,0 +1,22 @@
+#+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 = [
+ ./cursor.nix
+ ./fonts.nix
+ ./hyprland.nix
+ ./programs/core.nix
+ ./services/core.nix
+ ];
+
+ home.username = "jane";
+ home.homeDirectory = "/home/jane";
+
+ home.stateVersion = "24.05";
+ programs.home-manager.enable = true;
+ }
+#+end_src
diff --git a/nixos/.flake/home/cursor.nix b/nixos/.flake/home/cursor.org
index b7b55c4..15396a0 100644
--- a/nixos/.flake/home/cursor.nix
+++ b/nixos/.flake/home/cursor.org
@@ -1,3 +1,7 @@
+#+title: Cursor Configuration
+
+Use =vanilla-dmz= cursor size 16.
+#+begin_src nix :tangle ~/.flake/home/cursor.nix :mkdirp yes
{ config, pkgs, ... }:
{
@@ -6,3 +10,4 @@
"Xcursor.size" = 16;
};
}
+#+end_src
diff --git a/nixos/.flake/home/fonts.nix b/nixos/.flake/home/fonts.org
index 420f1d8..3a01993 100644
--- a/nixos/.flake/home/fonts.nix
+++ b/nixos/.flake/home/fonts.org
@@ -1,3 +1,7 @@
+#+title: Font Configuration
+
+Install fonts necessary for my configuration.
+#+begin_src nix :tangle ~/.flake/home/fonts.nix :mkdirp yes
{ config, pkgs, ... }:
{
@@ -7,3 +11,4 @@
(pkgs.nerdfonts.override { fonts = [ "SourceCodePro" ]; })
];
}
+#+end_src
diff --git a/nixos/.flake/home/hyprland.nix b/nixos/.flake/home/hyprland.nix
deleted file mode 100644
index 8f2495e..0000000
--- a/nixos/.flake/home/hyprland.nix
+++ /dev/null
@@ -1,121 +0,0 @@
-{ config, pkgs, ... }:
-
-{
- wayland.windowManager.hyprland = {
- enable = true;
- settings = {
- monitor = [ "DP-2, 2560x1440@180, 0x0, 1" "HDMI-A-2, 1920x1080@60, -1080x-100, 1, transform, 3" ];
- "$terminal" = "foot";
- "$fileManager" = "dolphin";
- "$menu" = "fuzzel";
- exec-once = [
- "nm-applet &"
- "blueman-applet &"
- "waybar"
- "swaybg -m fill -i ~/.wallpaper"
- "mpdscribble"
- ];
- env = [
- "XCURSOR_SIZE,24"
- "HYPRCURSOR_SIZE,24"
- ];
- 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)";
- };
- 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";
- };
- };
- 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"
- ];
- };
- dwindle = {
- pseudotile = true;
- preserve_split = true;
- };
- master = {
- new_status = "master";
- };
- input = {
- kb_layout = "us";
- follow_mouse = 1;
- sensitivity = 0;
- };
- "$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:.*";
- };
- };
-}
diff --git a/nixos/.flake/home/hyprland.org b/nixos/.flake/home/hyprland.org
new file mode 100644
index 0000000..725f920
--- /dev/null
+++ b/nixos/.flake/home/hyprland.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/programs/core.nix b/nixos/.flake/home/programs/core.nix
deleted file mode 100644
index 7fb94d1..0000000
--- a/nixos/.flake/home/programs/core.nix
+++ /dev/null
@@ -1,32 +0,0 @@
-{ config, pkgs, ... }:
-
-{
- imports = [
- ./fastfetch.nix
- ./foot.nix
- ./git.nix
- ./hyprlock.nix
- ./ncmpcpp.nix
- ./ssh.nix
- ./waybar.nix
- ./zsh.nix
- ];
-
- home.packages = with pkgs; [
- discord # not FOSS
- fuzzel
- gcc
- htop
- hyfetch
- hyprshot
- mpc-cli
- mpv
- networkmanagerapplet
- obs-studio
- pavucontrol
- prismlauncher # minecraft
- python3
- swaybg
- texliveFull
- ];
-}
diff --git a/nixos/.flake/home/programs/core.org b/nixos/.flake/home/programs/core.org
new file mode 100644
index 0000000..7c64b46
--- /dev/null
+++ b/nixos/.flake/home/programs/core.org
@@ -0,0 +1,39 @@
+#+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
+ ./ssh.nix
+ ./waybar.nix
+ ./zsh.nix
+ ];
+
+ home.packages = with pkgs; [
+ discord # not FOSS
+ eza
+ fuzzel
+ gcc
+ htop
+ hyfetch
+ hyprshot
+ lesspipe
+ mpc-cli
+ mpv
+ networkmanagerapplet
+ obs-studio
+ pavucontrol
+ prismlauncher # minecraft
+ python3
+ swaybg
+ texliveFull
+ ];
+ }
+#+end_src
diff --git a/nixos/.flake/home/programs/fastfetch.nix b/nixos/.flake/home/programs/fastfetch.nix
deleted file mode 100644
index f143bd6..0000000
--- a/nixos/.flake/home/programs/fastfetch.nix
+++ /dev/null
@@ -1,79 +0,0 @@
-{ 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"
- ];
- };
- };
-}
diff --git a/nixos/.flake/home/programs/fastfetch.org b/nixos/.flake/home/programs/fastfetch.org
new file mode 100644
index 0000000..96b2044
--- /dev/null
+++ b/nixos/.flake/home/programs/fastfetch.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/foot.nix b/nixos/.flake/home/programs/foot.org
index 18d7263..3490bed 100644
--- a/nixos/.flake/home/programs/foot.nix
+++ b/nixos/.flake/home/programs/foot.org
@@ -1,3 +1,7 @@
+#+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, ... }:
{
@@ -35,3 +39,4 @@
};
};
}
+#+end_src
diff --git a/nixos/.flake/home/programs/git.nix b/nixos/.flake/home/programs/git.nix
deleted file mode 100644
index d9c126a..0000000
--- a/nixos/.flake/home/programs/git.nix
+++ /dev/null
@@ -1,9 +0,0 @@
-{ config, pkgs, ... }:
-
-{
- programs.git = {
- enable = true;
- userName = "Jacob Janzen";
- userEmail = "jacob.a.s.janzen@gmail.com";
- };
-}
diff --git a/nixos/.flake/home/programs/git.org b/nixos/.flake/home/programs/git.org
new file mode 100644
index 0000000..baf3aaa
--- /dev/null
+++ b/nixos/.flake/home/programs/git.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/hyprlock.nix b/nixos/.flake/home/programs/hyprlock.nix
deleted file mode 100644
index 175331d..0000000
--- a/nixos/.flake/home/programs/hyprlock.nix
+++ /dev/null
@@ -1,37 +0,0 @@
-{ 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 = "<span foreground=\"##cad3f5\">Password...</span>";
- shadow_passes = 2;
- }
- ];
- };
- };
-}
diff --git a/nixos/.flake/home/programs/hyprlock.org b/nixos/.flake/home/programs/hyprlock.org
new file mode 100644
index 0000000..4e94386
--- /dev/null
+++ b/nixos/.flake/home/programs/hyprlock.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 = "<span foreground=\"##cad3f5\">Password...</span>";
+ shadow_passes = 2;
+ }
+ ];
+ };
+ };
+ }
+#+end_src
diff --git a/nixos/.flake/home/programs/ncmpcpp.nix b/nixos/.flake/home/programs/ncmpcpp.org
index f9ab2b9..eb1f02f 100644
--- a/nixos/.flake/home/programs/ncmpcpp.nix
+++ b/nixos/.flake/home/programs/ncmpcpp.org
@@ -1,3 +1,7 @@
+#+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, ... }:
{
@@ -21,3 +25,4 @@
};
};
}
+#+end_src
diff --git a/nixos/.flake/home/programs/ssh.nix b/nixos/.flake/home/programs/ssh.nix
deleted file mode 100644
index 960a5cd..0000000
--- a/nixos/.flake/home/programs/ssh.nix
+++ /dev/null
@@ -1,8 +0,0 @@
-{ config, pkgs, ... }:
-
-{
- programs.ssh = {
- enable = true;
- addKeysToAgent = "yes";
- };
-}
diff --git a/nixos/.flake/home/programs/ssh.org b/nixos/.flake/home/programs/ssh.org
new file mode 100644
index 0000000..a7502d2
--- /dev/null
+++ b/nixos/.flake/home/programs/ssh.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/waybar.nix b/nixos/.flake/home/programs/waybar.nix
deleted file mode 100644
index 5ef4b17..0000000
--- a/nixos/.flake/home/programs/waybar.nix
+++ /dev/null
@@ -1,145 +0,0 @@
-{ 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;
- }
-
- /* If workspaces is the rightmost module, omit right margin */
- .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;
- }
- '';
- };
-}
diff --git a/nixos/.flake/home/programs/waybar.org b/nixos/.flake/home/programs/waybar.org
new file mode 100644
index 0000000..7fe40f3
--- /dev/null
+++ b/nixos/.flake/home/programs/waybar.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/zsh.nix b/nixos/.flake/home/programs/zsh.nix
deleted file mode 100644
index 8b8bfad..0000000
--- a/nixos/.flake/home/programs/zsh.nix
+++ /dev/null
@@ -1,47 +0,0 @@
-{ config, pkgs, ... }:
-
-{
- programs.zsh = {
- enable = true;
- autocd = true;
- autosuggestion = {
- enable = true;
- };
- defaultKeymap = "viins";
- history = {
- append = true;
- ignoreAllDups = true;
- };
- shellAliases = {
- "ll" = "ls -alF";
- "la" = "ls -a";
- "l" = "ls -F";
- "sl" = "ls";
- };
- syntaxHighlighting.enable = true;
- initExtra = ''
- which lesspipe.sh &> /dev/null && export LESSOPEN="|lesspipe.sh %s"
- which eza &> /dev/null && alias ls=eza
- which nvim &> /dev/null && alias vi=nvim && alias vim=nvim
- 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) $ '
- '';
- 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
- '';
- };
-}
diff --git a/nixos/.flake/home/programs/zsh.org b/nixos/.flake/home/programs/zsh.org
new file mode 100644
index 0000000..f2368e2
--- /dev/null
+++ b/nixos/.flake/home/programs/zsh.org
@@ -0,0 +1,88 @@
+#+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
+ which nvim &> /dev/null && alias vi=nvim && alias vim=nvim
+ 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/services/core.nix b/nixos/.flake/home/services/core.org
index a9380a6..bd4c1d2 100644
--- a/nixos/.flake/home/services/core.nix
+++ b/nixos/.flake/home/services/core.org
@@ -1,3 +1,7 @@
+#+title: Core Service Configuration
+
+Import service configurations.
+#+begin_src nix :tangle ~/.flake/home/services/core.nix :mkdirp yes
{ config, pkgs, ... }:
{
@@ -12,3 +16,4 @@
mpdscribble
];
}
+#+end_src
diff --git a/nixos/.flake/home/services/emacs.nix b/nixos/.flake/home/services/emacs.nix
deleted file mode 100644
index 867ef0b..0000000
--- a/nixos/.flake/home/services/emacs.nix
+++ /dev/null
@@ -1,9 +0,0 @@
-{ config, pkgs, ... }:
-
-{
- services.emacs = {
- enable = true;
- client.enable = true;
- socketActivation.enable = true;
- };
-}
diff --git a/nixos/.flake/home/services/emacs.org b/nixos/.flake/home/services/emacs.org
new file mode 100644
index 0000000..1a11446
--- /dev/null
+++ b/nixos/.flake/home/services/emacs.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/mako.nix b/nixos/.flake/home/services/mako.nix
deleted file mode 100644
index 021cb8c..0000000
--- a/nixos/.flake/home/services/mako.nix
+++ /dev/null
@@ -1,8 +0,0 @@
-{ config, pkgs, ... }:
-
-{
- services.mako = {
- enable = true;
- backgroundColor = "#191916ff";
- };
-}
diff --git a/nixos/.flake/home/services/mako.org b/nixos/.flake/home/services/mako.org
new file mode 100644
index 0000000..caa0240
--- /dev/null
+++ b/nixos/.flake/home/services/mako.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/mpd.nix b/nixos/.flake/home/services/mpd.nix
deleted file mode 100644
index a5a5dc0..0000000
--- a/nixos/.flake/home/services/mpd.nix
+++ /dev/null
@@ -1,16 +0,0 @@
-{ config, pkgs, ... }:
-
-{
- services.mpd = {
- enable = true;
- musicDirectory = "~/Music";
- extraConfig = ''
- audio_output {
- type "pipewire"
- name "Pipewire"
- mixer_type "hardware"
- enabled "yes"
- }
- '';
- };
-}
diff --git a/nixos/.flake/home/services/mpd.org b/nixos/.flake/home/services/mpd.org
new file mode 100644
index 0000000..b985b2a
--- /dev/null
+++ b/nixos/.flake/home/services/mpd.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/syncthing.nix b/nixos/.flake/home/services/syncthing.nix
deleted file mode 100644
index 1eccd8d..0000000
--- a/nixos/.flake/home/services/syncthing.nix
+++ /dev/null
@@ -1,7 +0,0 @@
-{ config, pkgs, ... }:
-
-{
- services.syncthing = {
- enable = true;
- };
-}
diff --git a/nixos/.flake/home/services/syncthing.org b/nixos/.flake/home/services/syncthing.org
new file mode 100644
index 0000000..42dbf50
--- /dev/null
+++ b/nixos/.flake/home/services/syncthing.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/system/boot.nix b/nixos/.flake/system/boot.nix
deleted file mode 100644
index d911b6b..0000000
--- a/nixos/.flake/system/boot.nix
+++ /dev/null
@@ -1,6 +0,0 @@
-{ config, lib, pkgs, ... }:
-
-{
- boot.loader.systemd-boot.enable = true;
- boot.loader.efi.canTouchEfiVariables = true;
-}
diff --git a/nixos/.flake/system/boot.org b/nixos/.flake/system/boot.org
new file mode 100644
index 0000000..fe98542
--- /dev/null
+++ b/nixos/.flake/system/boot.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/core.nix b/nixos/.flake/system/core.org
index b15a520..e909198 100644
--- a/nixos/.flake/system/core.nix
+++ b/nixos/.flake/system/core.org
@@ -1,7 +1,7 @@
-# Edit this configuration file to define what should be installed on
-# your system. Help is available in the configuration.nix(5) man page, on
-# https://search.nixos.org/options and in the NixOS manual (`nixos-help`).
+#+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, ... }:
{
@@ -18,3 +18,4 @@
system.stateVersion = "24.05";
}
+#+end_src
diff --git a/nixos/.flake/system/desktop.nix b/nixos/.flake/system/desktop.nix
deleted file mode 100644
index 2e3fa2b..0000000
--- a/nixos/.flake/system/desktop.nix
+++ /dev/null
@@ -1,54 +0,0 @@
-{ config, lib, pkgs, ... }:
-
-{
- nixpkgs.config.allowUnfree = true;
- security.pam.services.hyprlock = {};
- services.flatpak.enable = true;
- xdg.portal.enable = true;
- services.xserver.enable = true;
- 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;
- };
-
- programs.hyprland.enable = true;
-
- services.xserver.xkb.layout = "us";
-
- services.pipewire = {
- enable = true;
- pulse.enable = true;
- };
- environment.systemPackages = with pkgs; [
- dolphin
- firefox
- git
- greetd.tuigreet
- kitty
- neovim
- wget
- ];
- environment.sessionVariables.NIXOS_OZONE_WL = "1";
- programs.zsh.enable = true;
- environment.variables.EDITOR = "vim";
- environment.pathsToLink = [ "/share/zsh" ];
-
- programs.gnupg.agent = {
- enable = true;
- enableSSHSupport = true;
- };
-}
diff --git a/nixos/.flake/system/desktop.org b/nixos/.flake/system/desktop.org
new file mode 100644
index 0000000..0bb6a6e
--- /dev/null
+++ b/nixos/.flake/system/desktop.org
@@ -0,0 +1,103 @@
+#+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
+
+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
+
+Enable Flatpaks.
+#+begin_src nix :tangle ~/.flake/system/desktop.nix :mkdirp yes
+ services.flatpak.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 b/nixos/.flake/system/locale.nix
deleted file mode 100644
index 320604a..0000000
--- a/nixos/.flake/system/locale.nix
+++ /dev/null
@@ -1,6 +0,0 @@
-{ config, lib, pkgs, ... }:
-
-{
- time.timeZone = "America/Winnipeg";
- i18n.defaultLocale = "en_CA.UTF-8";
-}
diff --git a/nixos/.flake/system/locale.org b/nixos/.flake/system/locale.org
new file mode 100644
index 0000000..63d05a0
--- /dev/null
+++ b/nixos/.flake/system/locale.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/network.nix b/nixos/.flake/system/network.nix
deleted file mode 100644
index 56951de..0000000
--- a/nixos/.flake/system/network.nix
+++ /dev/null
@@ -1,15 +0,0 @@
-{ config, lib, pkgs, ... }:
-
-{
- networking.hostName = "nixos";
- networking.networkmanager.enable = true;
- hardware.bluetooth.enable = true;
- hardware.bluetooth.powerOnBoot = true;
- services.blueman.enable = true;
- services.printing.enable = true;
- services.openssh.enable = true;
- networking.firewall = {
- allowedTCPPorts = [ ];
- allowedUDPPorts = [ ];
- };
-}
diff --git a/nixos/.flake/system/network.org b/nixos/.flake/system/network.org
new file mode 100644
index 0000000..06a0251
--- /dev/null
+++ b/nixos/.flake/system/network.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/users.nix b/nixos/.flake/system/users.nix
deleted file mode 100644
index 59c9e21..0000000
--- a/nixos/.flake/system/users.nix
+++ /dev/null
@@ -1,9 +0,0 @@
-{ config, lib, pkgs, ... }:
-
-{
- users.users.jane = {
- shell = pkgs.zsh;
- isNormalUser = true;
- extraGroups = [ "networkmanager" "wheel" ];
- };
-}
diff --git a/nixos/.flake/system/users.org b/nixos/.flake/system/users.org
new file mode 100644
index 0000000..498857a
--- /dev/null
+++ b/nixos/.flake/system/users.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