Changing the Sway Config

flake.lock

@@ -68,11 +68,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1765794845,
+        "lastModified": 1766150702,
-        "narHash": "sha256-YD5QWlGnusNbZCqR3pxG8tRxx9yUXayLZfAJRWspq2s=",
+        "narHash": "sha256-P0kM+5o+DKnB6raXgFEk3azw8Wqg5FL6wyl9jD+G5a4=",
         "owner": "nix-community",
         "repo": "disko",
-        "rev": "7194cfe5b7a3660726b0fe7296070eaef601cae9",
+        "rev": "916506443ecd0d0b4a0f4cf9d40a3c22ce39b378",
         "type": "github"
       },
       "original": {
@@ -173,11 +173,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1765860045,
+        "lastModified": 1766387499,
-        "narHash": "sha256-7Lxp/PfOy4h3QIDtmWG/EgycaswqRSkDX4DGtet14NE=",
+        "narHash": "sha256-AjK3/UKDzeXFeYNLVBaJ3+HLE9he1g5UrlNd4/BM3eA=",
         "owner": "nix-community",
         "repo": "home-manager",
-        "rev": "09de9577d47d8bffb11c449b6a3d24e32ac16c99",
+        "rev": "527ad07e6625302b648ed3b28c34b62a79bd103e",
         "type": "github"
       },
       "original": {
@@ -216,11 +216,11 @@
         "nixpkgs": "nixpkgs"
       },
       "locked": {
-        "lastModified": 1764763336,
+        "lastModified": 1766321686,
-        "narHash": "sha256-007DlZGjQ3ziQ5UMjt3GdjBAbgAtHgMwOxMY2v7/b7c=",
+        "narHash": "sha256-icOWbnD977HXhveirqA10zoqvErczVs3NKx8Bj+ikHY=",
         "owner": "simple-nixos-mailserver",
         "repo": "nixos-mailserver",
-        "rev": "1ccd57f177539ed8c207b893c3f9798d88f87d2e",
+        "rev": "7d433bf89882f61621f95082e90a4ab91eb0bdd3",
         "type": "gitlab"
       },
       "original": {
@@ -295,11 +295,11 @@
     },
     "nixpkgs-stable": {
       "locked": {
-        "lastModified": 1765687488,
+        "lastModified": 1766014764,
-        "narHash": "sha256-7YAJ6xgBAQ/Nr+7MI13Tui1ULflgAdKh63m1tfYV7+M=",
+        "narHash": "sha256-+73VffE5GP5fvbib6Hs1Su6LehG+9UV1Kzs90T2gBLA=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "d02bcc33948ca19b0aaa0213fe987ceec1f4ebe1",
+        "rev": "2b0d2b456e4e8452cf1c16d00118d145f31160f9",
         "type": "github"
       },
       "original": {
@@ -311,11 +311,11 @@
     },
     "nixpkgs-unstable": {
       "locked": {
-        "lastModified": 1765779637,
+        "lastModified": 1766309749,
-        "narHash": "sha256-KJ2wa/BLSrTqDjbfyNx70ov/HdgNBCBBSQP3BIzKnv4=",
+        "narHash": "sha256-3xY8CZ4rSnQ0NqGhMKAy5vgC+2IVK0NoVEzDoOh4DA4=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "1306659b587dc277866c7b69eb97e5f07864d8c4",
+        "rev": "a6531044f6d0bef691ea18d4d4ce44d0daa6e816",
         "type": "github"
       },
       "original": {
@@ -327,11 +327,11 @@
     },
     "nixpkgs_2": {
       "locked": {
-        "lastModified": 1765779637,
+        "lastModified": 1766309749,
-        "narHash": "sha256-KJ2wa/BLSrTqDjbfyNx70ov/HdgNBCBBSQP3BIzKnv4=",
+        "narHash": "sha256-3xY8CZ4rSnQ0NqGhMKAy5vgC+2IVK0NoVEzDoOh4DA4=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "1306659b587dc277866c7b69eb97e5f07864d8c4",
+        "rev": "a6531044f6d0bef691ea18d4d4ce44d0daa6e816",
         "type": "github"
       },
       "original": {
@@ -410,11 +410,11 @@
         "nixpkgs": "nixpkgs_3"
       },
       "locked": {
-        "lastModified": 1765946036,
+        "lastModified": 1766410104,
-        "narHash": "sha256-R/qaIkzqm00qBMr8onM6ZZFX49lvsQLZ79adVubqjts=",
+        "narHash": "sha256-Eh+TUdb4CGscBLG3Q6QOQOjEdPCmHPClGyeHf4F67Mk=",
         "owner": "0xc000022070",
         "repo": "zen-browser-flake",
-        "rev": "7db019a64483743a8d92319baafbbe71b687d0a1",
+        "rev": "eaff1bc54b9a8bd698c2dc47823400460e9f38a0",
         "type": "github"
       },
       "original": {

hosts/triforce/default.nix

@@ -10,9 +10,9 @@ in {
 
       ../../modules
       ../../modules/desktop
-      ../../modules/gaming
+      ../../modules/desktop/gaming
-      ../../modules/gnome
+      ../../modules/desktop/gnome
-      ../../modules/sway
+      ../../modules/desktop/sway
 
       nix-flatpak.nixosModules.nix-flatpak
       agenix.nixosModules.default

modules/desktop/packages.nix

@@ -44,8 +44,8 @@
       unstable.adwaita-fonts
       twitter-color-emoji
       twemoji-color-font
-      # (nerdfonts.override { fonts = [ "JetBrainsMono" ]; })
       nerd-fonts.jetbrains-mono
+      local.amy-mono
     ];
 
     fontconfig = {

modules/server/taf/default.nix

@@ -85,6 +85,7 @@
               }
               # Crans Root
               elsif anyof (
+                  address :is :all "To" "root@crans.org",
                   address :is :all "From" "root@crans.org",
                   address :is :all "From" "www-data@crans.org"
                 ) {

pkgs/amy-mono/default.nix

@@ -0,0 +1,37 @@
+{
+  lib,
+  stdenvNoCC,
+  fetchurl,
+}:
+
+stdenvNoCC.mkDerivation {
+  pname = "amy-mono";
+  version = "0";
+
+  src = fetchurl {
+    name = "amy-mono";
+    url = "https://www.ameliathe1st.gay/docs/AmyMono-Regular.otf";
+    hash = "sha256-2P70KiyRZc2xYpjpdLBWgBVYIFa8XYG2YYnPhL/eBhI=";
+    recursiveHash = true;
+    downloadToTemp = true;
+    postFetch = ''
+      mkdir $out
+      mv $downloadedFile $out/AmyMono-Regular.otf
+    '';
+  };
+
+  unpackPhase = ":";
+
+  installPhase = ''
+    runHook preInstall
+    install -Dm644 -t "$out/share/fonts/opentype/" "$src/AmyMono-Regular.otf"
+    runHook postInstall
+  '';
+
+  meta = {
+    description = "Amelia's Amy Mono font";
+    homepage = "https://www.ameliathe1st.gay/";
+    license = lib.licenses.ofl; # As per our personal messages
+    platforms = lib.platforms.all;
+  };
+}

pkgs/default.nix

@@ -4,4 +4,5 @@
   quadcastrgb = pkgs.callPackage ./quadcastrgb { };
   ens-intel-unite = pkgs.callPackage ./ens-intel-unite { };
   KhinsiderDownloader = pkgs.callPackage ./KhinsiderDownloader { };
+  amy-mono = pkgs.callPackage ./amy-mono { };
 }

users/lyes/desktop/home.nix

@@ -16,6 +16,7 @@ in
 {
   imports = [
     ./dconf.nix
+    ./sway.nix
   ];
 
   # Directories
@@ -101,6 +102,21 @@ in
     extensions = map (x: { id = x.extensionUuid; package = x; }) extensions;
   };
 
+  # Cursor
+  home.pointerCursor = {
+    enable = true;
+    name = "Adwaita";
+    package = pkgs.adwaita-icon-theme;
+    size = 24;
+    x11 = {
+      enable = true;
+      defaultCursor = "Adwaita";
+    };
+    dotIcons.enable = true;
+    gtk.enable = true;
+    sway.enable = true;
+  };
+
   # Background
   xdg.configFile."background".source = ./background;
 
@@ -123,4 +139,6 @@ in
         }
       '';
   };
+
+  services.mpd-mpris.enable = true;
 }

users/lyes/desktop/packages.nix

@@ -166,6 +166,9 @@ in {
   # Flatpaks
   services.flatpak = lib.mkIf (config?services.flatpak.packages) {
     packages = [
+      # Internet
+      "net.waterfox.waterfox"
+
       # Messaging
       "org.signal.Signal"
 

users/lyes/home/editors/helix.nix

@@ -6,7 +6,8 @@
     defaultEditor = true;
 
     settings = {
-      theme = "gruvbox_dark_hard";
+      # theme = "gruvbox_dark_hard";
+      theme = "rose_pine_moon";
 
       editor = {
         rulers = [ 80 ];