adding server config to repo. setting up laptop in repo. other changes.

.sops.yaml

@@ -0,0 +1,7 @@
+keys:
+  - &primary age1mvup35ycxdxum8ergeagtjqxshdprr8av9yg5myl89y5nthwyqhqws86ny
+creation_rules:
+  - path_regex: secrets/secrets.yaml$
+    key_groups:
+      - age:
+        - *primary

flake.lock

@@ -8,11 +8,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1759362264,
+        "lastModified": 1768135262,
-        "narHash": "sha256-wfG0S7pltlYyZTM+qqlhJ7GMw2fTF4mLKCIVhLii/4M=",
+        "narHash": "sha256-PVvu7OqHBGWN16zSi6tEmPwwHQ4rLPU9Plvs8/1TUBY=",
         "owner": "hercules-ci",
         "repo": "flake-parts",
-        "rev": "758cf7296bee11f1706a574c77d072b8a7baa881",
+        "rev": "80daad04eddbbf5a4d883996a73f3f542fa437ac",
         "type": "github"
       },
       "original": {
@@ -21,24 +21,6 @@
         "type": "github"
       }
     },
-    "flake-utils": {
-      "inputs": {
-        "systems": "systems"
-      },
-      "locked": {
-        "lastModified": 1731533236,
-        "narHash": "sha256-l0KFg5HjrsfsO/JpG+r7fRrqm12kzFHyUHqHCVpMMbI=",
-        "owner": "numtide",
-        "repo": "flake-utils",
-        "rev": "11707dc2f618dd54ca8739b309ec4fc024de578b",
-        "type": "github"
-      },
-      "original": {
-        "owner": "numtide",
-        "repo": "flake-utils",
-        "type": "github"
-      }
-    },
     "home-manager": {
       "inputs": {
         "nixpkgs": [
@@ -46,11 +28,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1760312644,
+        "lastModified": 1769813945,
-        "narHash": "sha256-U9SkK45314urw9P7MmjhEgiQwwD/BTj+T3HTuz1JU1Q=",
+        "narHash": "sha256-9ABv9Lo9t6MrFjlnRnU8Zw1C6LVj2+R8PipQ/rxGLHk=",
         "owner": "nix-community",
         "repo": "home-manager",
-        "rev": "e121f3773fa596ecaba5b22e518936a632d72a90",
+        "rev": "475921375def3eb930e1f8883f619ff8609accb6",
         "type": "github"
       },
       "original": {
@@ -59,41 +41,13 @@
         "type": "github"
       }
     },
-    "ixx": {
-      "inputs": {
-        "flake-utils": [
-          "nixvim",
-          "nuschtosSearch",
-          "flake-utils"
-        ],
-        "nixpkgs": [
-          "nixvim",
-          "nuschtosSearch",
-          "nixpkgs"
-        ]
-      },
-      "locked": {
-        "lastModified": 1754860581,
-        "narHash": "sha256-EM0IE63OHxXCOpDHXaTyHIOk2cNvMCGPqLt/IdtVxgk=",
-        "owner": "NuschtOS",
-        "repo": "ixx",
-        "rev": "babfe85a876162c4acc9ab6fb4483df88fa1f281",
-        "type": "github"
-      },
-      "original": {
-        "owner": "NuschtOS",
-        "ref": "v0.1.1",
-        "repo": "ixx",
-        "type": "github"
-      }
-    },
     "nixpkgs": {
       "locked": {
-        "lastModified": 1760284886,
+        "lastModified": 1769461804,
-        "narHash": "sha256-TK9Kr0BYBQ/1P5kAsnNQhmWWKgmZXwUQr4ZMjCzWf2c=",
+        "narHash": "sha256-msG8SU5WsBUfVVa/9RPLaymvi5bI8edTavbIq3vRlhI=",
         "owner": "nixos",
         "repo": "nixpkgs",
-        "rev": "cf3f5c4def3c7b5f1fc012b3d839575dbe552d43",
+        "rev": "bfc1b8a4574108ceef22f02bafcf6611380c100d",
         "type": "github"
       },
       "original": {
@@ -109,15 +63,14 @@
         "nixpkgs": [
           "nixpkgs"
         ],
-        "nuschtosSearch": "nuschtosSearch",
+        "systems": "systems"
-        "systems": "systems_2"
       },
       "locked": {
-        "lastModified": 1760353389,
+        "lastModified": 1769644746,
-        "narHash": "sha256-/NLkyQww0DEkGqC6drAUK5MEFhhygibv8tyNGpWzR3E=",
+        "narHash": "sha256-1X9o0GjCzku03magX4pM+1OZXA0aUTN7KvEReZ9t3OU=",
         "owner": "nix-community",
         "repo": "nixvim",
-        "rev": "69d72bb82d7ba1904df47cf092ce1d4c88448001",
+        "rev": "3c27e1b35ca0fee6a89bfc20840654361ffe888d",
         "type": "github"
       },
       "original": {
@@ -126,29 +79,6 @@
         "type": "github"
       }
     },
-    "nuschtosSearch": {
-      "inputs": {
-        "flake-utils": "flake-utils",
-        "ixx": "ixx",
-        "nixpkgs": [
-          "nixvim",
-          "nixpkgs"
-        ]
-      },
-      "locked": {
-        "lastModified": 1758662783,
-        "narHash": "sha256-igrxT+/MnmcftPOHEb+XDwAMq3Xg1Xy7kVYQaHhPlAg=",
-        "owner": "NuschtOS",
-        "repo": "search",
-        "rev": "7d4c0fc4ffe3bd64e5630417162e9e04e64b27a4",
-        "type": "github"
-      },
-      "original": {
-        "owner": "NuschtOS",
-        "repo": "search",
-        "type": "github"
-      }
-    },
     "root": {
       "inputs": {
         "home-manager": "home-manager",
@@ -170,21 +100,6 @@
         "repo": "default",
         "type": "github"
       }
-    },
-    "systems_2": {
-      "locked": {
-        "lastModified": 1681028828,
-        "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=",
-        "owner": "nix-systems",
-        "repo": "default",
-        "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e",
-        "type": "github"
-      },
-      "original": {
-        "owner": "nix-systems",
-        "repo": "default",
-        "type": "github"
-      }
     }
   },
   "root": "root",

flake.nix

@@ -11,14 +11,28 @@
 			url = "github:nix-community/nixvim";
 			inputs.nixpkgs.follows = "nixpkgs";
 		};
+		sops-nix.url = "github:Mic92/sops-nix";
+
 	};
 
-	outputs = { self, nixpkgs, home-manager, nixvim }@inputs: {
+	outputs = { self, nixpkgs, home-manager, nixvim, sops-nix }@inputs: {
 		nixosConfigurations = {
 			lily-desktop = nixpkgs.lib.nixosSystem {
+				system = "x86_64-linux";
+				modules = [ ./hosts/desktop/configuration.nix ];
+				specialArgs = { inherit inputs; };
+			};
+
+			laptop = nixpkgs.lib.nixosSystem {
+				system = "x86_64-linux";
+				modules = [ ./hosts/laptop/configuration.nix ];
+				specialArgs = { inherit inputs; };
+			};
+			lily-server = nixpkgs.lib.nixosSystem {
 				system = "x86_64-linux";
 				modules = [
-					./hosts/desktop/configuration.nix 
+					sops-nix.nixosModules.sops
+						./hosts/server/configuration.nix
 				];
 				specialArgs = { inherit inputs; };
 			};

hosts/desktop/configuration.nix

@@ -3,10 +3,14 @@
 	imports =
 		[ # Include the results of the hardware scan.
 		./hardware-configuration.nix
+		./snapshot.nix
 		../../modules/nixos/localization.nix
 		../../modules/nixos/ai/default.nix
 		../../modules/nixos/desktops/gnome.nix
-		../../modules/nixos/desktops/hyprland.nix
+		../../modules/nixos/desktops/river.nix
+		../../modules/nixos/applications.nix
+		../../modules/nixos/fonts.nix
+		../../modules/nixos/programming.nix
 		];
 
 # Bootloader.
@@ -57,9 +61,18 @@
 		];
 	};
 
+	users.users.work = {
+		isNormalUser = true;
+		description = "Lily Luna Anderson";
+		extraGroups = [ "networkmanager" "wheel" ];
+		packages = with pkgs; [
+#  thunderbird
+		];
+	};
+
 	programs.nh = {
 		enable = true;
-		flake = "/home/lily/Programming/New LiNix";
+		flake = "/home/lily/Programming/LiNix";
 	};
 
 
@@ -91,6 +104,8 @@
 			steam-run
 
 			git
+
+			material-cursors
 	];
 
 # Some programs need SUID wrappers, can be configured further or are

hosts/desktop/snapshot.nix

@@ -0,0 +1,31 @@
+{ config, pkgs, inputs, ... }:
+{
+	services.btrbk = {
+		instances."local_snapshots" = {
+			onCalendar = "hourly";
+			settings = {
+				snapshot_preserve = "14d 8w 120m";
+				snapshot_preserve_min = "7d";
+				volume = {
+					"/media/2tb" = {
+						snapshot_dir = "/media/2tb/@snapshots";
+						subvolume = "@home";
+					};
+				};
+			};
+		};
+		instances."duplicate_to_second_drive" = {
+			onCalendar = "daily";
+			settings = {
+				snapshot_preserve = "14d 8w 120m";
+				snapshot_preserve_min = "7d";
+				volume = {
+					"/media/2tb" = {
+						target = "/media/12tb/@snapshots";
+						subvolume = "@home";
+					};
+				};
+			};
+		};
+	};
+}

hosts/laptop/configuration.nix

@@ -0,0 +1,130 @@
+# Edit this configuration file to define what should be installed on
+# your system.  Help is available in the configuration.nix(5) man page
+# and in the NixOS manual (accessible by running ‘nixos-help’).
+
+{ config, pkgs, ... }:
+
+{
+  imports =
+    [ # Include the results of the hardware scan.
+      ./hardware-configuration.nix
+		../../modules/nixos/localization.nix
+		../../modules/nixos/applications.nix
+		../../modules/nixos/fonts.nix
+		../../modules/nixos/programming.nix
+
+    ];
+
+  # Bootloader.
+  boot.loader.systemd-boot.enable = true;
+  boot.loader.efi.canTouchEfiVariables = true;
+
+  networking.hostName = "laptop"; # Define your hostname.
+  # networking.wireless.enable = true;  # Enables wireless support via wpa_supplicant.
+
+  # Configure network proxy if necessary
+  # networking.proxy.default = "http://user:password@proxy:port/";
+  # networking.proxy.noProxy = "127.0.0.1,localhost,internal.domain";
+
+  # Enable networking
+  networking.networkmanager.enable = true;
+
+  # Enable the X11 windowing system.
+  # You can disable this if you're only using the Wayland session.
+  services.xserver.enable = true;
+
+  # Enable the KDE Plasma Desktop Environment.
+  services.displayManager.sddm.enable = true;
+  services.desktopManager.plasma6.enable = true;
+
+  # Enable CUPS to print documents.
+  services.printing.enable = true;
+
+  # Enable sound with pipewire.
+  services.pulseaudio.enable = false;
+  security.rtkit.enable = true;
+  services.pipewire = {
+    enable = true;
+    alsa.enable = true;
+    alsa.support32Bit = true;
+    pulse.enable = true;
+    # If you want to use JACK applications, uncomment this
+    #jack.enable = true;
+
+    # use the example session manager (no others are packaged yet so this is enabled by default,
+    # no need to redefine it in your config for now)
+    #media-session.enable = true;
+  };
+
+  # Enable touchpad support (enabled default in most desktopManager).
+  # services.xserver.libinput.enable = true;
+
+  # Define a user account. Don't forget to set a password with ‘passwd’.
+  users.users.lily = {
+    isNormalUser = true;
+    description = "Lily Luna Anderson";
+    extraGroups = [ "networkmanager" "wheel" "lily" ];
+    packages = with pkgs; [
+      kdePackages.kate
+    #  thunderbird
+    ];
+  };
+
+  users.groups.lily = { };
+	programs.nh = {
+		enable = true;
+		flake = "/home/lily/Programming/LiNix";
+	};
+
+
+
+  # Install firefox.
+  programs.firefox.enable = true;
+
+  # Allow unfree packages
+  nixpkgs.config.allowUnfree = true;
+
+  # List packages installed in system profile. To search, run:
+  # $ nix search wget
+  environment.systemPackages = with pkgs; [
+  vim # Do not forget to add an editor to edit configuration.nix! The Nano editor is also installed by default.
+git
+gimp
+home-manager
+bluez
+kdePackages.plasma-keyboard
+kdePackages.bluedevil
+kdePackages.bluez-qt
+#  wget
+  ];
+
+nix.settings.experimental-features = [ "nix-command" "flakes" ];
+
+  # Some programs need SUID wrappers, can be configured further or are
+  # started in user sessions.
+  # programs.mtr.enable = true;
+  # programs.gnupg.agent = {
+  #   enable = true;
+  #   enableSSHSupport = true;
+  # };
+
+  # List services that you want to enable:
+
+  # Enable the OpenSSH daemon.
+  # services.openssh.enable = true;	
+
+  # Open ports in the firewall.
+  # networking.firewall.allowedTCPPorts = [ ... ];
+  # networking.firewall.allowedUDPPorts = [ ... ];
+  # Or disable the firewall altogether.
+  # networking.firewall.enable = false;
+
+  # This value determines the NixOS release from which the default
+  # settings for stateful data, like file locations and database versions
+  # on your system were taken. It‘s perfectly fine and recommended to leave
+  # this value at the release version of the first install of this system.
+  # Before changing this value read the documentation for this option
+  # (e.g. man configuration.nix or on https://nixos.org/nixos/options.html).
+  system.stateVersion = "25.11"; # Did you read the comment?
+
+}

hosts/laptop/hardware-configuration.nix

@@ -0,0 +1,47 @@
+# Do not modify this file!  It was generated by ‘nixos-generate-config’
+# and may be overwritten by future invocations.  Please make changes
+# to /etc/nixos/configuration.nix instead.
+{ config, lib, pkgs, modulesPath, ... }:
+
+{
+  imports =
+    [ (modulesPath + "/installer/scan/not-detected.nix")
+    ];
+
+  boot.initrd.availableKernelModules = [ "xhci_pci" "nvme" "usb_storage" "sd_mod" ];
+  boot.initrd.kernelModules = [ ];
+  boot.kernelModules = [ "kvm-intel" ];
+  boot.extraModulePackages = [ ];
+
+  fileSystems."/" =
+    { device = "/dev/mapper/luks-fbc12fd4-a2b8-44b1-a89a-e502662b1fce";
+      fsType = "btrfs";
+      options = [ "subvol=@" ];
+    };
+
+  boot.initrd.luks.devices."luks-fbc12fd4-a2b8-44b1-a89a-e502662b1fce".device = "/dev/disk/by-uuid/fbc12fd4-a2b8-44b1-a89a-e502662b1fce";
+
+  fileSystems."/home" =
+    { device = "/dev/mapper/luks-fbc12fd4-a2b8-44b1-a89a-e502662b1fce";
+      fsType = "btrfs";
+      options = [ "subvol=@home" ];
+    };
+
+  fileSystems."/media/nvme" =
+    { device = "/dev/mapper/luks-fbc12fd4-a2b8-44b1-a89a-e502662b1fce";
+      fsType = "btrfs";
+      #options = [ ];
+    };
+
+
+  fileSystems."/boot" =
+    { device = "/dev/disk/by-uuid/C51E-CE6C";
+      fsType = "vfat";
+      options = [ "fmask=0077" "dmask=0077" ];
+    };
+
+  swapDevices = [ ];
+
+  nixpkgs.hostPlatform = lib.mkDefault "x86_64-linux";
+  hardware.cpu.intel.updateMicrocode = lib.mkDefault config.hardware.enableRedistributableFirmware;
+}

hosts/server/configuration.nix

@@ -0,0 +1,45 @@
+{ config, pkgs, ... }:
+{
+  imports = [ 
+    ./hardware-configuration.nix 
+    ./nginx.nix
+  ];
+
+  boot.loader.systemd-boot.enable = true;
+  boot.loader.efi.canTouchEfiVariables = true;
+
+  networking.hostName = "lily-server";
+  networking.networkmanager.enable = true;
+
+  services.displayManager.sddm.enable = true;
+  services.desktopManager.plasma6.enable = true;
+
+  services.openssh = {
+    enable = true;
+    settings = {
+      PasswordAuthentication = false;
+      PermitRootLogin = "no";
+      X11Forwarding = false;
+    };
+  };
+
+    nixpkgs.config.allowUnfree = true;
+    networking.firewall.allowedTCPPorts = [ 22 80 443 9001 9002 ];
+
+users.users.lily = {
+isNormalUser = true;
+description = "Lily Luna";
+extraGroups = [ "networkmanager" "wheel" "lily" "input" "uinput" ];
+};
+users.groups.lily = { };
+
+	programs.nh = {
+		enable = true;
+		flake = "/home/lily/Programming/LiNix26";
+	};
+
+environment.systemPackages = with pkgs; [ vim firefox ];
+nix.settings.experimental-features = [ "nix-command" "flakes" ];
+
+    system.stateVersion = "24.11";
+}

hosts/server/hardware-configuration.nix

@@ -0,0 +1,40 @@
+# Do not modify this file!  It was generated by ‘nixos-generate-config’
+# and may be overwritten by future invocations.  Please make changes
+# to /etc/nixos/configuration.nix instead.
+{ config, lib, pkgs, modulesPath, ... }:
+
+{
+	imports =
+		[ (modulesPath + "/installer/scan/not-detected.nix")
+		];
+
+	boot.initrd.availableKernelModules = [ "xhci_pci" "ehci_pci" "ahci" "usbhid" "usb_storage" "sd_mod" "sr_mod" ];
+	boot.initrd.kernelModules = [ ];
+	boot.kernelModules = [ "kvm-intel" ];
+	boot.extraModulePackages = [ ];
+
+	fileSystems."/" =
+	{ device = "/dev/disk/by-uuid/208d39a0-fa7d-4fe4-be61-8867e7a51bc8";
+		fsType = "ext4";
+	};
+
+	fileSystems."/boot" =
+	{ device = "/dev/disk/by-uuid/AED2-D209";
+		fsType = "vfat";
+		options = [ "fmask=0077" "dmask=0077" ];
+	};
+
+	swapDevices =
+		[ { device = "/dev/disk/by-uuid/ec9d9773-d48b-4221-af73-7c365fe0966d"; }
+		];
+
+# Enables DHCP on each ethernet and wireless interface. In case of scripted networking
+# (the default) this is the recommended approach. When using systemd-networkd it's
+# still possible to use this option, but it's recommended to use it in conjunction
+# with explicit per-interface declarations with `networking.interfaces.<interface>.useDHCP`.
+		networking.useDHCP = lib.mkDefault true;
+# networking.interfaces.eno1.useDHCP = lib.mkDefault true;
+
+		nixpkgs.hostPlatform = lib.mkDefault "x86_64-linux";
+		hardware.cpu.intel.updateMicrocode = lib.mkDefault config.hardware.enableRedistributableFirmware;
+}

hosts/server/jupyter.nix

@@ -0,0 +1,11 @@
+{ config, pkgs, ... }:
+{
+  services.jupyter = {
+    enable = false;
+    ip = "0.0.0.0";
+    port = 9002;
+    password = "'argon2:$argon2id$v=19$m=10240,t=10,p=8$wcvyvCdrrixsD/IUfOij7A$D05SNCsu0gtkCk7V7QSQw3RkcrUfoKXWzn9N/MJjRIA'";
+    notebookDir = "/var/www/jupyter.lilyanderson.xyz";
+    notebookConfig = "c.ServerApp.root_dir = '/var/www/jupyter.lilyanderson.xyz'";
+  };
+}

hosts/server/nginx.nix

@@ -0,0 +1,158 @@
+{ config, pkgs, ... }:
+{
+  imports = [ ./jupyter.nix ];
+  users.users.nginx.extraGroups = [ "acme" ];
+  systemd.services.webdavPrivate = {
+    description = "Rclone WebDAV server";
+    after = [ "network.target" ];
+    wantedBy = [ "multi-user.target" ];
+    serviceConfig = {
+      ExecStart = ''
+      ${pkgs.rclone}/bin/rclone serve webdav --addr :8081 --baseurl / --htpasswd /var/www/basic_auth /var/www/dav.lilyanderson.xyz
+      '';
+      Restart = "always";
+    };
+  };
+
+  services.nginx = {
+    enable = true;
+
+    virtualHosts = {
+#     "jupyter.lilyanderson.xyz" = {
+#       enableACME = true;
+#       forceSSL = true;
+#       locations."/" = {
+#         proxyPass = "http://localhost:9002";
+#       };
+#       basicAuthFile = "/var/www/basic_auth";
+#       extraConfig = ''
+# proxy_http_version 1.1;
+# proxy_set_header Upgrade $http_upgrade;
+# proxy_set_header Connection “upgrade”;
+# proxy_set_header Host $host;
+# proxy_set_header X-Real-IP $remote_addr;
+# proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
+# '';
+#     };
+
+      "lilyanderson.xyz" = {
+        locations."/" = {
+          root = "/var/www/web";
+        };
+      };
+
+      "ai.lilyanderson.xyz" = {
+        enableACME = true;
+        forceSSL = true;
+        locations."/" = {
+          proxyPass = "http://localhost:9001";
+        };
+		extraConfig = ''
+			client_body_timeout 300;
+			client_header_timeout 300;
+			keepalive_timeout 300;
+			proxy_connect_timeout 300;
+			proxy_send_timeout 300;
+			proxy_read_timeout 300;
+
+# Add WebSocket support
+			proxy_http_version 1.1;
+			proxy_set_header Upgrade $http_upgrade;
+			proxy_set_header Connection "upgrade";
+
+			proxy_set_header Host $host;
+			proxy_set_header X-Real-IP $remote_addr;
+			proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
+			proxy_set_header X-Forwarded-Proto $scheme;
+
+# Disable proxy buffering for better streaming response from models
+			proxy_buffering off;
+			'';
+      };
+
+      "dav.lilyanderson.xyz" = {
+            enableACME = true;
+            forceSSL = true;
+            locations."/" = {
+              proxyPass = "http://localhost:8081";
+            };
+      };
+
+      "swap.lilyanderson.xyz" = {
+        enableACME = true;
+        forceSSL = true;
+        locations."/" = {
+          proxyPass = "http://192.168.0.101:9001";
+        };
+        basicAuthFile = "/var/www/basic_auth";
+      };
+
+      "192.168.0.42" = {
+      };
+
+
+      "git.lilyanderson.xyz" = {
+		enableACME = true;
+	    forceSSL = true;
+		locations."/" = {
+		  proxyPass = "http://localhost:3001";
+	  	};
+	  };
+    };
+  };
+	services.postgresql = {
+		ensureDatabases = [ config.services.gitea.user ];
+		ensureUsers = [
+		{
+			name = config.services.gitea.database.user;
+			ensureDBOwnership = true;
+#ensurePermissions."DATABASE ${config.services.gitea.database.name}" = "ALL PRIVILEGES";
+		}
+		];
+	};
+
+    sops = {
+      age.keyFile = "/secrets/age/keys.txt";
+	  defaultSopsFile = ../../secrets/secrets.yaml;
+	  defaultSopsFormat = "yaml";
+	  secrets."postgres/gitea_dbpass" = { 
+        owner = config.services.gitea.user;
+	  };
+    };
+
+	services.gitea = {
+		enable = true;
+		appName = "Lily's Gitea Server";
+		database = {
+			type = "postgres";
+			passwordFile = config.sops.secrets."postgres/gitea_dbpass".path;
+		};
+
+		settings.service.DISABLE_REGISTRATION = true;
+
+		settings.server = {
+			DOMAIN = "git.lilyanderson.xyz";
+			ROOT_URL = "https://git.lilyanderson.xyz";
+			HTTP_PORT = 3001;
+		};
+	};
+
+
+
+  security.acme = {
+    acceptTerms = true;
+    defaults.email = "lilylanderson@zoho.com";
+  };
+
+  services.open-webui = {
+    enable = true;
+    host = "0.0.0.0";
+    port = 9001;
+    environment = {
+      ANONYMIZED_TELEMETRY = "False";
+      DO_NOT_TRACK = "True";
+      SCARF_NO_ANALYTICS = "True";
+      ENABLE_LOGIN_FORM = "True";
+    };
+  };
+}

modules/home/alacritty.nix

@@ -0,0 +1,11 @@
+{ pkgs, lib, ... }:
+{
+	programs.alacritty = {
+		enable = true;
+		settings = {
+			window = {
+				opacity = 0.95;
+			};
+		};
+	};
+}

modules/home/games.nix

@@ -0,0 +1,11 @@
+{ pkgs, lib, ... }:
+{
+	nixpkgs.config.allowUnfree = true;
+	home.packages = with pkgs; [
+		steam
+		azahar
+		desmume
+		mgba
+		ryubing
+	];
+}

modules/home/hyprland.nix

@@ -1,123 +0,0 @@
-{ pkgs, lib, ... }:
-let 
-startupScript = pkgs.pkgs.writeShellScriptBin "start" ''
-${pkgs.waybar}/bin/waybar &
-${pkgs.swww}/bin/swww init &
-
-sleep 1
-'';
-in
-{
-	wayland.windowManager.hyprland = {
-		enable = true;
-
-		settings = {
-			exec-once = ''${startupScript}/bin/start'';
-			decoration = {
-				#shadow_offset = "0.5";
-				#"col.shadow" = "rgba(00000099)";
-			};
-
-			monitor = [
-				"DP-2, preferred, auto-right, auto"
-				"DP-3, preferred, auto-left, auto"
-				",preferred,auto,auto"
-			];
-
-			"$mod" = "SUPER";
-			"$terminal" = "alacritty";
-			"$browser" = "firefox";
-
-			general = {
-				gaps_in = 5;
-				gaps_out = 20;
-				border_size = 2;
-				resize_on_border = true;
-				layout = "master";
-			};
-
-			bindm = [
-				"$mod, mouse:272, movewindow"
-				"$mod, mouse:273, resizewindow"
-				"$mod ALT, mouse:272, resizewindow"
-			];
-
-			bind = [
-				"$mod, return, exec, $terminal"
-				"$mod, W, exec, $browser"
-				"$mod, Q, killactive,"
-				"$mod, M, exit,"
-				"$mod, E, exec, $fileManager"
-				"$mod, V, togglefloating,"
-				"$mod, R, exec, $menu"
-				"$mod, P, pseudo, # dwindle"
-				"$mod, J, togglesplit, # dwindle"
-				"$mod, left, movefocus, l"
-				"$mod, right, movefocus, r"
-				"$mod, up, movefocus, u"
-				"$mod, down, movefocus, d"
-
-				"$mod, 1, workspace, 1"
-				"$mod, 2, workspace, 2"
-				"$mod, 3, workspace, 3"
-				"$mod, 4, workspace, 4"
-				"$mod, 5, workspace, 5"
-				"$mod, 6, workspace, 6"
-				"$mod, 7, workspace, 7"
-				"$mod, 8, workspace, 8"
-				"$mod, 9, workspace, 9"
-				"$mod, 0, workspace, 10"
-
-				"$mod SHIFT, 1, movetoworkspace, 1"
-				"$mod SHIFT, 2, movetoworkspace, 2"
-				"$mod SHIFT, 3, movetoworkspace, 3"
-				"$mod SHIFT, 4, movetoworkspace, 4"
-				"$mod SHIFT, 5, movetoworkspace, 5"
-				"$mod SHIFT, 6, movetoworkspace, 6"
-				"$mod SHIFT, 7, movetoworkspace, 7"
-				"$mod SHIFT, 8, movetoworkspace, 8"
-				"$mod SHIFT, 9, movetoworkspace, 9"
-				"$mod SHIFT, 0, movetoworkspace, 10"
-
-				"$mod, S, togglespecialworkspace, magic"
-				"$mod SHIFT, S, movetoworkspace, special:magic"
-
-				"$mod, mouse_down, workspace, e+1"
-				"$mod, mouse_up, workspace, e-1"
-			];
-
-			animations = {
-				enabled = true;
-    #   	     NAME,           X0,   Y0,   X1,   Y1
-				bezier = [
-					"easeOutQuint,   0.23, 1,    0.32, 1"
-					"easeInOutCubic, 0.65, 0.05, 0.36, 1"
-					"linear,         0,    0,    1,    1"
-					"almostLinear,   0.5,  0.5,  0.75, 1"
-					"quick,          0.15, 0,    0.1,  1"
-				];
-
-    #           NAME,          ONOFF, SPEED, CURVE,        [STYLE]
-				animation = [
-					"global,        1,     10,    default"
-					"border,        1,     5.39,  easeOutQuint"
-					"windows,       1,     4.79,  easeOutQuint"
-					"windowsIn,     1,     4.1,   easeOutQuint, popin 87%"
-					"windowsOut,    1,     1.49,  linear,       popin 87%"
-					"fadeIn,        1,     1.73,  almostLinear"
-					"fadeOut,       1,     1.46,  almostLinear"
-					"fade,          1,     3.03,  quick"
-					"layers,        1,     3.81,  easeOutQuint"
-					"layersIn,      1,     4,     easeOutQuint, fade"
-					"layersOut,     1,     1.5,   linear,       fade"
-					"fadeLayersIn,  1,     1.79,  almostLinear"
-					"fadeLayersOut, 1,     1.39,  almostLinear"
-					"workspaces,    1,     1.94,  almostLinear, fade"
-					"workspacesIn,  1,     1.21,  almostLinear, fade"
-					"workspacesOut, 1,     1.94,  almostLinear, fade"
-					"zoomFactor,    1,     7,     quick"
-				];
-			};
-		};
-	};
-}

modules/home/river.nix

@@ -0,0 +1,149 @@
+{ pkgs, lib, ... }:
+{
+	wayland.windowManager.river = {
+		enable = true;
+		settings = {
+			map = {
+				normal = {
+					/* Manage Session and Windows */
+					"Super Q" = "close";
+					"Super+Shift Q" = "exit";
+					"Super J" = "focus-view next";
+					"Super K" = "focus-view previous";
+					"Super+Shift J" = "swap next";
+					"Super+Shift K" = "swap previous";
+					"Super H" = "send-layout-cmd rivertile \"main-ratio -0.05\"";
+					"Super L" = "send-layout-cmd rivertile \"main-ratio +0.05\"";
+					"Super+Shift H" = "send-layout-cmd rivertile \"main-count +1\"";
+					"Super+Shift L" = "send-layout-cmd rivertile \"main-count -1\"";
+					
+					"Super Period" = "focus-output next";
+					"Super Comma" = "focus-output previous";
+
+					"Super+Shift Period" = "send-to-output next";
+					"Super+Shift Comma" = "send-to-output previous";
+
+					"Super+Alt H" = "move left 100";
+					"Super+Alt J" = "move down 100";
+					"Super+Alt K" = "move up 100";
+					"Super+Alt L" = "move right 100";
+
+					"Super+Alt+Control H" = "snap left";
+					"Super+Alt+Control J" = "snap down";
+					"Super+Alt+Control K" = "snap up";
+					"Super+Alt+Control L" = "snap right";
+
+					"Super+Alt+Shift H" = "resize horizontal -100";
+					"Super+Alt+Shift J" = "resize vertical 100";
+					"Super+Alt+Shift K" = "resize vertical -100";
+					"Super+Alt+Shift L" = "resize horizontal 100";
+
+
+					"Super Return" = "spawn alacritty";
+					"Super W" = "spawn firefox";
+					"Super R" = "spawn \"rofi -show drun\"";
+				};
+			};
+		};
+		extraConfig = ''
+# See the river(1), riverctl(1), and rivertile(1) man pages for complete
+
+# Super + Left Mouse Button to move views
+riverctl map-pointer normal Super BTN_LEFT move-view
+
+# Super + Right Mouse Button to resize views
+riverctl map-pointer normal Super BTN_RIGHT resize-view
+
+# Super + Middle Mouse Button to toggle float
+riverctl map-pointer normal Super BTN_MIDDLE toggle-float
+
+for i in $(seq 1 9)
+do
+    tags=$((1 << ($i - 1)))
+
+    # Super+[1-9] to focus tag [0-8]
+    riverctl map normal Super $i set-focused-tags $tags
+
+    # Super+Shift+[1-9] to tag focused view with tag [0-8]
+    riverctl map normal Super+Shift $i set-view-tags $tags
+
+    # Super+Control+[1-9] to toggle focus of tag [0-8]
+    riverctl map normal Super+Control $i toggle-focused-tags $tags
+
+    # Super+Shift+Control+[1-9] to toggle tag [0-8] of focused view
+    riverctl map normal Super+Shift+Control $i toggle-view-tags $tags
+done
+
+# Super+0 to focus all tags
+# Super+Shift+0 to tag focused view with all tags
+all_tags=$(((1 << 32) - 1))
+riverctl map normal Super 0 set-focused-tags $all_tags
+riverctl map normal Super+Shift 0 set-view-tags $all_tags
+
+# Super+Space to toggle float
+riverctl map normal Super Space toggle-float
+
+# Super+F to toggle fullscreen
+riverctl map normal Super F toggle-fullscreen
+
+# Super+{Up,Right,Down,Left} to change layout orientation
+riverctl map normal Super Up    send-layout-cmd rivertile "main-location top"
+riverctl map normal Super Right send-layout-cmd rivertile "main-location right"
+riverctl map normal Super Down  send-layout-cmd rivertile "main-location bottom"
+riverctl map normal Super Left  send-layout-cmd rivertile "main-location left"
+
+# Declare a passthrough mode. This mode has only a single mapping to return to
+# normal mode. This makes it useful for testing a nested wayland compositor
+riverctl declare-mode passthrough
+
+# Super+F11 to enter passthrough mode
+riverctl map normal Super F11 enter-mode passthrough
+
+# Super+F11 to return to normal mode
+riverctl map passthrough Super F11 enter-mode normal
+
+# Various media key mapping examples for both normal and locked mode which do
+# not have a modifier
+for mode in normal locked
+do
+    # Control pulse audio volume with pamixer (https://github.com/cdemoulins/pamixer)
+    riverctl map $mode None XF86AudioRaiseVolume  spawn 'pamixer -i 5'
+    riverctl map $mode None XF86AudioLowerVolume  spawn 'pamixer -d 5'
+    riverctl map $mode None XF86AudioMute         spawn 'pamixer --toggle-mute'
+
+    # Control MPRIS aware media players with playerctl (https://github.com/altdesktop/playerctl)
+    riverctl map $mode None XF86AudioMedia spawn 'playerctl play-pause'
+    riverctl map $mode None XF86AudioPlay  spawn 'playerctl play-pause'
+    riverctl map $mode None XF86AudioPrev  spawn 'playerctl previous'
+    riverctl map $mode None XF86AudioNext  spawn 'playerctl next'
+
+    # Control screen backlight brightness with brightnessctl (https://github.com/Hummer12007/brightnessctl)
+    riverctl map $mode None XF86MonBrightnessUp   spawn 'brightnessctl set +5%'
+    riverctl map $mode None XF86MonBrightnessDown spawn 'brightnessctl set 5%-'
+done
+
+# Set background and border color
+riverctl background-color 0x002b36
+riverctl border-color-focused 0x93a1a1
+riverctl border-color-unfocused 0x586e75
+
+# Set keyboard repeat rate
+riverctl set-repeat 50 300
+
+# Make all views with an app-id that starts with "float" and title "foo" start floating.
+riverctl rule-add -app-id 'float*' -title 'foo' float
+
+# Make all views with app-id "bar" and any title use client-side decorations
+riverctl rule-add -app-id "bar" csd
+
+# Set the default layout generator to be rivertile and start it.
+# River will send the process group of the init executable SIGTERM on exit.
+riverctl default-layout rivertile
+rivertile -view-padding 6 -outer-padding 6 &
+
+${pkgs.wlr-randr}/bin/wlr-randr --output DP-3 --pos -1440,0
+${pkgs.swww}/bin/swww-daemon &
+${pkgs.swww}/bin/swww restore
+'';
+	};
+}

modules/nixos/ai/ollama.nix

@@ -3,7 +3,6 @@
 	imports = [     ];
 	services.ollama = {
 		enable = true;
-		acceleration = "cuda";
 		host = "0.0.0.0";
 		openFirewall = true;
 	};

modules/nixos/ai/open-webui.nix

@@ -2,8 +2,8 @@
 {
 	imports = [     ];
 	services.open-webui = {
-#enable = true;
+enable = true;
-		enable = false;
+#		enable = false;
 		host = "0.0.0.0";
 		openFirewall = true;
 		port = 9001;

modules/nixos/applications.nix

@@ -0,0 +1,17 @@
+{ config, pkgs, inputs, ... }:
+{
+	imports = [    ];
+
+	environment.systemPackages = with pkgs; [
+		texstudio
+		texliveFull
+		gsettings-desktop-schemas
+	];
+
+	programs.dconf.enable = true;
+
+environment.sessionVariables.XDG_DATA_DIRS = [
+  "${pkgs.gsettings-desktop-schemas}/share/gsettings-schemas/${pkgs.gsettings-desktop-schemas.name}"
+  "${pkgs.gtk3}/share/gsettings-schemas/${pkgs.gtk3.name}"
+];
+}

modules/nixos/desktops/river.nix

@@ -0,0 +1,15 @@
+{ config, pkgs, inputs, ... }:
+{
+	imports = [ ./wm_apps.nix ];
+
+	programs.river-classic.enable = true;
+
+#Packages
+	environment.systemPackages = with pkgs; [
+		alacritty
+		font-awesome
+		libnotify
+		dunst
+		rofi
+	];
+}

modules/nixos/desktops/wm_apps.nix

@@ -2,12 +2,13 @@
 {
 	imports = [     ];
 
-	programs.hyprland.enable = true;
-
 #Packages
 	environment.systemPackages = with pkgs; [
 		alacritty
-
 		font-awesome
+		libnotify
+		dunst
+		rofi
+		swww
 	];
 }

modules/nixos/fonts.nix

@@ -0,0 +1,14 @@
+{ config, pkgs, inputs, ... }:
+{
+	imports = [    ];
+
+	environment.systemPackages = with pkgs; [
+		font-awesome
+		noto-fonts
+		noto-fonts-cjk-sans
+		noto-fonts-cjk-serif
+		nerd-fonts.noto
+		nerd-fonts.fira-code
+		nerd-fonts.droid-sans-mono
+	];
+}

modules/nixos/programming.nix

@@ -0,0 +1,11 @@
+{ config, pkgs, inputs, ... }:
+{
+	imports = [    ];
+
+	environment.systemPackages = with pkgs; [
+		cargo
+		cargo-mommy
+		gcc
+		rustc
+	];
+}

secrets/secrets.yaml

@@ -0,0 +1,23 @@
+porkbun:
+    api_pk: ENC[AES256_GCM,data:B2jR1JqqXegJ0xv7N6ydQy53m7GK8cEP0TclKdYynUgHeYjKYhuxbXh4+4wQer1IhZ9Xt9303TyYfjdUrH7Yzmk1yUg=,iv:mgKW9ZUrRA/VyxEdu6Hlq5JnoY7wczt5DatM7ibm840=,tag:S04wFVuGr/C2pLmt3jJ0sg==,type:str]
+    api_sk: ENC[AES256_GCM,data:MuvdysEmAroa/9A5FlDo3Wg9zrv8PBPXJZeJusHAYWGatXcVATYkEejYUfIj2hZIC73DzUExyVK3k1PCbNJiWV7aPSA=,iv:Ob3GRVIed3PFfNbjheOvihfgu0taB0QtGwXKHxEK/6E=,tag:XfeNRFBjwUVrQxARgdXiTA==,type:str]
+postgres:
+    gitea_dbpass: ENC[AES256_GCM,data:mFs+6HQ5viKWqwyTbzO0XE0frhg=,iv:j1nGCUHH7ZdL5XcSwxPngJ1XrIyQdh2Ynr9hl7b2wmY=,tag:KcSDYKVYxV2pdVBmkIxHfQ==,type:str]
+env_file: ENC[AES256_GCM,data:O8lNrxeG//OuM2Hgmo71oVncRSnfUMg7Db2YE6/NY2g+iP7T+EWKcujL/OATklMOAVEptRSDXHgCPHJbZFLp4SALmrE2qhnr4NZY3mJU4dJf7CERhFhnLtN60Pj3xmsdoswdf4goYOBlM3iv+x7D3btr5G4AlUFIUnsqU316SZ0CiGT7wHtbdrIIBVGQ5iTfnlK0lio2tTjtqUCTN6ED3xmzZemOtJopkE9GuoDb58q2z0j1uWe5vcg=,iv:44HlK6Owy47VYdt1r+g/X7mUqHM/OAiecKsVgdiAJkI=,tag:3chEB6bWNfWJXXr123y+mg==,type:str]
+nextcloud:
+    pass: ENC[AES256_GCM,data:EY5FH2CCCj4qxCauLHnuGQ==,iv:lxCgsfdT8K/3GmRI5PtMNTFGHlx5uzjTn51ORb9V0/c=,tag:ReYl31yDuhtY7mekhX/uwg==,type:str]
+sops:
+    age:
+        - recipient: age1mvup35ycxdxum8ergeagtjqxshdprr8av9yg5myl89y5nthwyqhqws86ny
+          enc: |
+            -----BEGIN AGE ENCRYPTED FILE-----
+            YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBxQ3hKR09JSXAvTnh2VDhu
+            ZzE2V093Z0I2Qzk4elFJaWJNMUF3cGwzWVdBCkRUcGxlNVFlQk1TZnNSSU5Bd2or
+            Z3VIL3drOEtSbmlxdWY1SnBGallXS2sKLS0tIGxKNjFRMlhiRnlpeGpvMEptTFYv
+            cGNCaHpWV0hsSlptN041Z1pRMjliUUEKaowR90GNNfov6jGOEufBF1fnj647mn9E
+            cQGbvv6PeEXJaUgQrr37WNXCdBVCrksd/ofB6hQ/J4qiOajO8ztTLQ==
+            -----END AGE ENCRYPTED FILE-----
+    lastmodified: "2025-05-22T04:36:40Z"
+    mac: ENC[AES256_GCM,data:5NsT0r5JLYV3QOPG46kXvN81eWPEyv7WFizpAO8jXJuJovzMSf5T8/BRqspTepd3y8dBifR3Fyc6K6RcklUA5xCOsZde0Kx5pJI6KaPcSwJAw9iVX7P+ahGdt+gRc9XwNgNKRtBgoqMe8Q76mr4ohxiCLsG0TBboLO/SotrQIeE=,iv:fLCq7Un+ugPmgZL4qpVadw0em1aRCsZ/VRDDXHZ480M=,tag:desvrZhekZulhqd+xxME3g==,type:str]
+    unencrypted_suffix: _unencrypted
+    version: 3.10.2

users/lily/home.nix

@@ -2,8 +2,10 @@
 
 {
 	imports = [
-		../../modules/home/vim.nix
+		#../../modules/home/vim.nix
-		../../modules/home/hyprland.nix
+		../../modules/home/river.nix
+		../../modules/home/games.nix
+		../../modules/home/alacritty.nix
 	];
 
 # Home Manager needs a bit of information about you and the paths it should
@@ -56,26 +58,22 @@
 # '';
 	};
 
-# Home Manager can also manage your environment variables through
-# 'home.sessionVariables'. These will be explicitly sourced when using a
-# shell provided by Home Manager. If you don't want to manage your shell
-# through Home Manager then you have to manually source 'hm-session-vars.sh'
-# located at either
-#
-#  ~/.nix-profile/etc/profile.d/hm-session-vars.sh
-#
-# or
-#
-#  ~/.local/state/nix/profiles/profile/etc/profile.d/hm-session-vars.sh
-#
-# or
-#
-#  /etc/profiles/per-user/lily/etc/profile.d/hm-session-vars.sh
-#
 	home.sessionVariables = {
+	NH_FLAKE = "/home/lily/Programming/LiNix";
 # EDITOR = "emacs";
 	};
 
+	programs = {
 # Let Home Manager install and manage itself.
-	programs.home-manager.enable = true;
+		home-manager.enable = true;
+		bash.enable = true;
+		git = {
+			enable = true;
+			settings.user = {
+				name = "Lily Anderson";
+				email = "lilylanderson@zoho.com";
+			};
+			lfs.enable = true;
+		};
+	};
 }