Config changes...

flake.lock

@@ -37,11 +37,11 @@
     "base16-helix": {
       "flake": false,
       "locked": {
-        "lastModified": 1736852337,
+        "lastModified": 1748408240,
-        "narHash": "sha256-esD42YdgLlEh7koBrSqcT7p2fsMctPAcGl/+2sYJa2o=",
+        "narHash": "sha256-9M2b1rMyMzJK0eusea0x3lyh3mu5nMeEDSc4RZkGm+g=",
         "owner": "tinted-theming",
         "repo": "base16-helix",
-        "rev": "03860521c40b0b9c04818f2218d9cc9efc21e7a5",
+        "rev": "6c711ab1a9db6f51e2f6887cc3345530b33e152e",
         "type": "github"
       },
       "original": {
@@ -90,11 +90,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1749436314,
+        "lastModified": 1751854533,
-        "narHash": "sha256-CqmqU5FRg5AadtIkxwu8ulDSOSoIisUMZRLlcED3Q5w=",
+        "narHash": "sha256-U/OQFplExOR1jazZY4KkaQkJqOl59xlh21HP9mI79Vc=",
         "owner": "nix-community",
         "repo": "disko",
-        "rev": "dfa4d1b9c39c0342ef133795127a3af14598017a",
+        "rev": "16b74a1e304197248a1bc663280f2548dbfcae3c",
         "type": "github"
       },
       "original": {
@@ -106,11 +106,11 @@
     "firefox-gnome-theme": {
       "flake": false,
       "locked": {
-        "lastModified": 1744642301,
+        "lastModified": 1748383148,
-        "narHash": "sha256-5A6LL7T0lttn1vrKsNOKUk9V0ittdW0VEqh6AtefxJ4=",
+        "narHash": "sha256-pGvD/RGuuPf/4oogsfeRaeMm6ipUIznI2QSILKjKzeA=",
         "owner": "rafaelmardojai",
         "repo": "firefox-gnome-theme",
-        "rev": "59e3de00f01e5adb851d824cf7911bd90c31083a",
+        "rev": "4eb2714fbed2b80e234312611a947d6cb7d70caf",
         "type": "github"
       },
       "original": {
@@ -119,21 +119,6 @@
         "type": "github"
       }
     },
-    "flake-compat": {
-      "locked": {
-        "lastModified": 1733328505,
-        "narHash": "sha256-NeCCThCEP3eCl2l/+27kNNK7QrwZB1IJCrXfrbv5oqU=",
-        "owner": "edolstra",
-        "repo": "flake-compat",
-        "rev": "ff81ac966bb2cae68946d5ed5fc4994f96d0ffec",
-        "type": "github"
-      },
-      "original": {
-        "owner": "edolstra",
-        "repo": "flake-compat",
-        "type": "github"
-      }
-    },
     "flake-parts": {
       "inputs": {
         "nixpkgs-lib": [
@@ -142,11 +127,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1733312601,
+        "lastModified": 1749398372,
-        "narHash": "sha256-4pDvzqnegAfRkPwO3wmwBhVi/Sye1mzps0zHWYnP88c=",
+        "narHash": "sha256-tYBdgS56eXYaWVW3fsnPQ/nFlgWi/Z2Ymhyu21zVM98=",
         "owner": "hercules-ci",
         "repo": "flake-parts",
-        "rev": "205b12d8b7cd4802fbcb8e8ef6a0f1408781a4f9",
+        "rev": "9305fe4e5c2a6fcf5ba6a3ff155720fbe4076569",
         "type": "github"
       },
       "original": {
@@ -171,54 +156,6 @@
         "type": "github"
       }
     },
-    "git-hooks": {
-      "inputs": {
-        "flake-compat": [
-          "stylix",
-          "flake-compat"
-        ],
-        "gitignore": "gitignore",
-        "nixpkgs": [
-          "stylix",
-          "nixpkgs"
-        ]
-      },
-      "locked": {
-        "lastModified": 1742649964,
-        "narHash": "sha256-DwOTp7nvfi8mRfuL1escHDXabVXFGT1VlPD1JHrtrco=",
-        "owner": "cachix",
-        "repo": "git-hooks.nix",
-        "rev": "dcf5072734cb576d2b0c59b2ac44f5050b5eac82",
-        "type": "github"
-      },
-      "original": {
-        "owner": "cachix",
-        "repo": "git-hooks.nix",
-        "type": "github"
-      }
-    },
-    "gitignore": {
-      "inputs": {
-        "nixpkgs": [
-          "stylix",
-          "git-hooks",
-          "nixpkgs"
-        ]
-      },
-      "locked": {
-        "lastModified": 1709087332,
-        "narHash": "sha256-HG2cCnktfHsKV0s4XW83gU3F57gaTljL9KNSuG6bnQs=",
-        "owner": "hercules-ci",
-        "repo": "gitignore.nix",
-        "rev": "637db329424fd7e46cf4185293b9cc8c88c95394",
-        "type": "github"
-      },
-      "original": {
-        "owner": "hercules-ci",
-        "repo": "gitignore.nix",
-        "type": "github"
-      }
-    },
     "gnome-shell": {
       "flake": false,
       "locked": {
@@ -243,33 +180,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1749154018,
+        "lastModified": 1751810233,
-        "narHash": "sha256-gjN3j7joRvT3a8Zgcylnd4NFsnXeDBumqiu4HmY1RIg=",
+        "narHash": "sha256-kllkNbIqQi3VplgTMeGzuh1t8Gk8TauvkTRt93Km+tQ=",
         "owner": "nix-community",
         "repo": "home-manager",
-        "rev": "7aae0ee71a17b19708b93b3ed448a1a0952bf111",
+        "rev": "9b0873b46c9f9e4b7aa01eb634952c206af53068",
-        "type": "github"
-      },
-      "original": {
-        "owner": "nix-community",
-        "ref": "release-25.05",
-        "repo": "home-manager",
-        "type": "github"
-      }
-    },
-    "home-manager_2": {
-      "inputs": {
-        "nixpkgs": [
-          "stylix",
-          "nixpkgs"
-        ]
-      },
-      "locked": {
-        "lastModified": 1747556831,
-        "narHash": "sha256-Qb84nbYFFk0DzFeqVoHltS2RodAYY5/HZQKE8WnBDsc=",
-        "owner": "nix-community",
-        "repo": "home-manager",
-        "rev": "d0bbd221482c2713cccb80220f3c9d16a6e20a33",
         "type": "github"
       },
       "original": {
@@ -289,11 +204,11 @@
         "xwayland-satellite-unstable": "xwayland-satellite-unstable"
       },
       "locked": {
-        "lastModified": 1750316774,
+        "lastModified": 1752057206,
-        "narHash": "sha256-JfksinMaAqBvx2kR9TV4/qHzK+RagIYZrizExMDLvmk=",
+        "narHash": "sha256-f8fNAag3K3WAq+lJr2EEu2f3xVSFLPddLgJKZRzXa3M=",
         "owner": "sodiboo",
         "repo": "niri-flake",
-        "rev": "a67455b8e84e6bff6bc381bed25fc83a1bbf0b5f",
+        "rev": "90c2edcf32d0fcb511fee9a0b8c580a18178c109",
         "type": "github"
       },
       "original": {
@@ -322,11 +237,11 @@
     "niri-unstable": {
       "flake": false,
       "locked": {
-        "lastModified": 1750225787,
+        "lastModified": 1750791124,
-        "narHash": "sha256-7O/8CChaOhSBSu94McHE0vyH0o+J5R4exq2DDq4zHAg=",
+        "narHash": "sha256-F5iVU/hjoSHSSe0gllxm0PcAaseEtGNanYK5Ha3k2Tg=",
         "owner": "YaLTeR",
         "repo": "niri",
-        "rev": "ed14e8da8476d5fde27b14d1dde03256a2f6e11b",
+        "rev": "37458d94b288945f6cfbd3c5c233f634d59f246c",
         "type": "github"
       },
       "original": {
@@ -356,11 +271,11 @@
     },
     "nixos-hardware": {
       "locked": {
-        "lastModified": 1749195551,
+        "lastModified": 1752048960,
-        "narHash": "sha256-W5GKQHgunda/OP9sbKENBZhMBDNu2QahoIPwnsF6CeM=",
+        "narHash": "sha256-gATnkOe37eeVwKKYCsL+OnS2gU4MmLuZFzzWCtaKLI8=",
         "owner": "NixOS",
         "repo": "nixos-hardware",
-        "rev": "4602f7e1d3f197b3cb540d5accf5669121629628",
+        "rev": "7ced9122cff2163c6a0212b8d1ec8c33a1660806",
         "type": "github"
       },
       "original": {
@@ -372,11 +287,11 @@
     },
     "nixpkgs": {
       "locked": {
-        "lastModified": 1750134718,
+        "lastModified": 1751792365,
-        "narHash": "sha256-v263g4GbxXv87hMXMCpjkIxd/viIF7p3JpJrwgKdNiI=",
+        "narHash": "sha256-J1kI6oAj25IG4EdVlg2hQz8NZTBNYvIS0l4wpr9KcUo=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "9e83b64f727c88a7711a2c463a7b16eedb69a84c",
+        "rev": "1fd8bada0b6117e6c7eb54aad5813023eed37ccb",
         "type": "github"
       },
       "original": {
@@ -403,11 +318,11 @@
     },
     "nixpkgs-stable": {
       "locked": {
-        "lastModified": 1750133334,
+        "lastModified": 1751943650,
-        "narHash": "sha256-urV51uWH7fVnhIvsZIELIYalMYsyr2FCalvlRTzqWRw=",
+        "narHash": "sha256-7orTnNqkGGru8Je6Un6mq1T8YVVU/O5kyW4+f9C1mZQ=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "36ab78dab7da2e4e27911007033713bab534187b",
+        "rev": "88983d4b665fb491861005137ce2b11a9f89f203",
         "type": "github"
       },
       "original": {
@@ -419,11 +334,11 @@
     },
     "nixpkgs-unstable": {
       "locked": {
-        "lastModified": 1749285348,
+        "lastModified": 1751792365,
-        "narHash": "sha256-frdhQvPbmDYaScPFiCnfdh3B/Vh81Uuoo0w5TkWmmjU=",
+        "narHash": "sha256-J1kI6oAj25IG4EdVlg2hQz8NZTBNYvIS0l4wpr9KcUo=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "3e3afe5174c561dee0df6f2c2b2236990146329f",
+        "rev": "1fd8bada0b6117e6c7eb54aad5813023eed37ccb",
         "type": "github"
       },
       "original": {
@@ -434,11 +349,11 @@
     },
     "nixpkgs_2": {
       "locked": {
-        "lastModified": 1749494155,
+        "lastModified": 1751943650,
-        "narHash": "sha256-FG4DEYBpROupu758beabUk9lhrblSf5hnv84v1TLqMc=",
+        "narHash": "sha256-7orTnNqkGGru8Je6Un6mq1T8YVVU/O5kyW4+f9C1mZQ=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "88331c17ba434359491e8d5889cce872464052c2",
+        "rev": "88983d4b665fb491861005137ce2b11a9f89f203",
         "type": "github"
       },
       "original": {
@@ -465,11 +380,11 @@
     },
     "nixpkgs_4": {
       "locked": {
-        "lastModified": 1747610100,
+        "lastModified": 1751211869,
-        "narHash": "sha256-rpR5ZPMkWzcnCcYYo3lScqfuzEw5Uyfh+R0EKZfroAc=",
+        "narHash": "sha256-1Cu92i1KSPbhPCKxoiVG5qnoRiKTgR5CcGSRyLpOd7Y=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "ca49c4304acf0973078db0a9d200fd2bae75676d",
+        "rev": "b43c397f6c213918d6cfe6e3550abfe79b5d1c51",
         "type": "github"
       },
       "original": {
@@ -492,11 +407,11 @@
         "treefmt-nix": "treefmt-nix"
       },
       "locked": {
-        "lastModified": 1746056780,
+        "lastModified": 1751320053,
-        "narHash": "sha256-/emueQGaoT4vu0QjU9LDOG5roxRSfdY0K2KkxuzazcM=",
+        "narHash": "sha256-3m6RMw0FbbaUUa01PNaMLoO7D99aBClmY5ed9V3vz+0=",
         "owner": "nix-community",
         "repo": "NUR",
-        "rev": "d476cd0972dd6242d76374fcc277e6735715c167",
+        "rev": "cbde1735782f9c2bb2c63d5e05fba171a14a4670",
         "type": "github"
       },
       "original": {
@@ -523,11 +438,11 @@
         "nixpkgs": "nixpkgs_3"
       },
       "locked": {
-        "lastModified": 1749592509,
+        "lastModified": 1751606940,
-        "narHash": "sha256-VunQzfZFA+Y6x3wYi2UE4DEQ8qKoAZZCnZPUlSoqC+A=",
+        "narHash": "sha256-KrDPXobG7DFKTOteqdSVeL1bMVitDcy7otpVZWDE6MA=",
         "owner": "Mic92",
         "repo": "sops-nix",
-        "rev": "50754dfaa0e24e313c626900d44ef431f3210138",
+        "rev": "3633fc4acf03f43b260244d94c71e9e14a2f6e0d",
         "type": "github"
       },
       "original": {
@@ -543,11 +458,8 @@
         "base16-helix": "base16-helix",
         "base16-vim": "base16-vim",
         "firefox-gnome-theme": "firefox-gnome-theme",
-        "flake-compat": "flake-compat",
         "flake-parts": "flake-parts",
-        "git-hooks": "git-hooks",
         "gnome-shell": "gnome-shell",
-        "home-manager": "home-manager_2",
         "nixpkgs": "nixpkgs_4",
         "nur": "nur",
         "systems": "systems",
@@ -558,11 +470,11 @@
         "tinted-zed": "tinted-zed"
       },
       "locked": {
-        "lastModified": 1749579811,
+        "lastModified": 1752014016,
-        "narHash": "sha256-sdyK8oWWDwxGXLvHTzcSfcb3sAdIb9UJYPVWlgb3eUM=",
+        "narHash": "sha256-Gn6cnUPchPenxUFDt+dh7836CNu3GM13aghTabfZUrU=",
         "owner": "danth",
         "repo": "stylix",
-        "rev": "51fb6796fd61c6b9e02b950ccb8baccd8602de2e",
+        "rev": "26042c1f59ae868193fa4378f85e4f6240f25ff8",
         "type": "github"
       },
       "original": {
@@ -623,11 +535,11 @@
     "tinted-schemes": {
       "flake": false,
       "locked": {
-        "lastModified": 1744974599,
+        "lastModified": 1750770351,
-        "narHash": "sha256-Fg+rdGs5FAgfkYNCs74lnl8vkQmiZVdBsziyPhVqrlY=",
+        "narHash": "sha256-LI+BnRoFNRa2ffbe3dcuIRYAUcGklBx0+EcFxlHj0SY=",
         "owner": "tinted-theming",
         "repo": "schemes",
-        "rev": "28c26a621123ad4ebd5bbfb34ab39421c0144bdd",
+        "rev": "5a775c6ffd6e6125947b393872cde95867d85a2a",
         "type": "github"
       },
       "original": {
@@ -639,11 +551,11 @@
     "tinted-tmux": {
       "flake": false,
       "locked": {
-        "lastModified": 1745111349,
+        "lastModified": 1751159871,
-        "narHash": "sha256-udV+nHdpqgkJI9D0mtvvAzbqubt9jdifS/KhTTbJ45w=",
+        "narHash": "sha256-UOHBN1fgHIEzvPmdNMHaDvdRMgLmEJh2hNmDrp3d3LE=",
         "owner": "tinted-theming",
         "repo": "tinted-tmux",
-        "rev": "e009f18a01182b63559fb28f1c786eb027c3dee9",
+        "rev": "bded5e24407cec9d01bd47a317d15b9223a1546c",
         "type": "github"
       },
       "original": {
@@ -655,11 +567,11 @@
     "tinted-zed": {
       "flake": false,
       "locked": {
-        "lastModified": 1725758778,
+        "lastModified": 1751158968,
-        "narHash": "sha256-8P1b6mJWyYcu36WRlSVbuj575QWIFZALZMTg5ID/sM4=",
+        "narHash": "sha256-ksOyv7D3SRRtebpXxgpG4TK8gZSKFc4TIZpR+C98jX8=",
         "owner": "tinted-theming",
         "repo": "base16-zed",
-        "rev": "122c9e5c0e6f27211361a04fae92df97940eccf9",
+        "rev": "86a470d94204f7652b906ab0d378e4231a5b3384",
         "type": "github"
       },
       "original": {
@@ -710,11 +622,11 @@
     "xwayland-satellite-unstable": {
       "flake": false,
       "locked": {
-        "lastModified": 1749315541,
+        "lastModified": 1751228685,
-        "narHash": "sha256-bEik1BfVOFnWvtOrcOHluos/edJ8f+G2y1QySbt/0Ak=",
+        "narHash": "sha256-MENtauGBhJ+kDeFaawvWGXaFG3Il6qQzjaP0RmtfM0k=",
         "owner": "Supreeeme",
         "repo": "xwayland-satellite",
-        "rev": "da2ecb5be816de35e2efe23a408a1c49fe8b11ba",
+        "rev": "557ebeb616e03d5e4a8049862bbbd1f02c6f020b",
         "type": "github"
       },
       "original": {

hosts/ch-clt-dsk01/home.nix

@@ -13,8 +13,10 @@
     };
 
     settings = {
+      host = "c-clt-dsk01";
+
       applications.common.enable = true;
-      applications.alacritty.enable = false;
+      applications.alacritty.enable = true;
       applications.devenv.enable = false;
       applications.firefox.enable = true;
       applications.git.enable = true;

hosts/p-th-rpi-01/home.nix

@@ -13,6 +13,8 @@
     };
 
     settings = {
+      host = "p-th-rpi-01";
+    
       applications.common.enable = false;
       applications.alacritty.enable = false;
       applications.devenv.enable = false;

hosts/ti-clt-dsk01/configuration.nix

@@ -1,4 +1,4 @@
-{ inputs, outputs, pkgs, ... }:
+{ inputs, outputs, pkgs, lib, ... }:
 
 {
 	imports = [
@@ -9,9 +9,9 @@
 
   settings = {
 		hostname = "ti-clt-dsk01";
-    display-manager = "cosmic-greeter";
+    display-manager = "greetd";
     desktop-environments = {
-      cosmic.enable = true;
+      cosmic.enable = false;
       hyprland.enable = false;
       gnome.enable = false;
       niri.enable = true;
@@ -77,18 +77,6 @@
     ];
   };
 
-  # Setup nfs share
-  services.nfs = {
-    server = {
-      enable = true;
-      exports = ''
-        /export 192.168.100.0/24(rw,fsid=0,no_subtree_check)
-        /export/wrb 192.168.100.0/24(rw,nohide,no_subtree_check)
-      '';
-    };
-  };
-  networking.firewall.allowedTCPPorts = [ 2049 ];
-
   # Temp keyboard override
   environment.systemPackages = with pkgs; [
     via

hosts/ti-clt-dsk01/home.nix

@@ -13,6 +13,8 @@
     };
 
     settings = {
+      host = "ti-clt-dsk01";
+
       applications.common.enable = true;
       applications.alacritty.enable = false;
       applications.devenv.enable = true;

hosts/ti-clt-lpt01/configuration.nix

@@ -11,11 +11,12 @@
 
   settings = {
     hostname = "ti-clt-lpt01";
-    display-manager = "cosmic-greeter";
+    display-manager = "greetd";
     desktop-environments = {
-      cosmic.enable = true;
+      cosmic.enable = false;
-      hyprland.enable = true;
+      hyprland.enable = false;
       gnome.enable = false;
+      niri.enable = true;
     };
     applications = {
       common.enable = true;
@@ -43,9 +44,15 @@
   users.users.xeovalyte = {
     isNormalUser = true;
     description = "Timo Boomers";
-    extraGroups = [ "networkmanager" "wheel" "dialout" ];
+    extraGroups = [ "networkmanager" "wheel" "dialout" "adbusers" ];
   };
 
+  networking.networkmanager.enable = true;
+
+  programs.nix-ld.enable = true;
+  programs.adb.enable = true;
+  services.power-profiles-daemon.enable = true;
+  
   # Boot.
   boot.loader.efi.canTouchEfiVariables = true;
   boot.loader.grub = {
@@ -73,30 +80,6 @@
     ];
   };
 
-  # Create samba share
-  services.samba = {
-    enable = true;
-    securityType = "user";
-    openFirewall = true;
-    settings = {
-      "public" = {
-        "path" = "/home/xeovalyte/Public";
-        "browseable" = "yes";
-        "read only" = "no";
-        "guest ok" = "yes";
-        "create mask" = "0644";
-        "directory mask" = "0755";
-        "force user" = "xeovalyte";
-        "force group" = "xeovalyte";
-      };
-    };
-  };
-
-  services.samba-wsdd = {
-    enable = true;
-    openFirewall = true;
-  };
-
   networking.firewall = {
     enable = true;
     allowedTCPPorts = [ 22 80 443 53 ];

hosts/ti-clt-lpt01/home.nix

@@ -13,6 +13,8 @@
     };
 
     settings = {
+      host = "ti-clt-lpt01";
+
       applications.common.enable = true;
       applications.alacritty.enable = true;
       applications.devenv.enable = true;
@@ -45,6 +47,7 @@
       theming.stylix.theme = "da-one-ocean";
 
       desktop-environments.hyprland.enable = false;
+      desktop-environments.niri.enable = true;
     };
 
     home.packages = with pkgs; [
@@ -64,6 +67,7 @@
       unstable.surfer # waveform viewer
       unstable.vscode
       pomodoro-gtk
+      unstable.brave
 
       # Office
       libreoffice

hosts/ti-clt-tbl01/home.nix

@@ -13,6 +13,8 @@
     };
 
     settings = {
+      host = "ti-clt-tbl01";
+
       applications.common.enable = true;
       applications.alacritty.enable = false;
       applications.devenv.enable = false;

hosts/v-th-ctr-01/home.nix

@@ -13,6 +13,8 @@
     };
 
     settings = {
+      host = "v-th-ctr-01";
+
       applications.common.enable = false;
       applications.alacritty.enable = false;
       applications.devenv.enable = false;

modules/home/applications/helix.nix

@@ -95,7 +95,6 @@ in {
           insert = "bar";
         };
         editor.end-of-line-diagnostics = "hint";
-        editor.inline-diagnostics.cursor-line = "error";
       };
       languages = {
         # Rust

modules/home/default.nix

@@ -1,6 +1,13 @@
 { inputs, outputs, config, lib, ... }:
 
 {
+  options = {
+    settings.host = lib.mkOption {
+      type = lib.types.str;
+      description = "Hostname";
+    };
+  };
+
   imports = [
     ./applications/alacritty.nix
     ./applications/common.nix

modules/home/desktop-environments/niri/default.nix

@@ -18,11 +18,14 @@ in {
   imports = [
     inputs.niri.homeModules.niri
     ./waybar.nix
+    ./mako.nix
+    ./swww.nix
   ];
 
   config = mkIf cfg.enable {
     home.packages = with pkgs; [
       fuzzel
+      brightnessctl
     ];
 
     programs.alacritty = {
@@ -32,10 +35,24 @@ in {
       };
     };
 
+
+    # Configure default applications
+    xdg.mimeApps = {
+      enable = true;
+      defaultApplications = {
+        "text/html" = "firefox.desktop";
+        "x-scheme-handler/http" = "firefox.desktop";
+        "x-scheme-handler/https" = "firefox.desktop";
+        "x-scheme-handler/about" = "firefox.desktop";
+        "x-scheme-handler/unknown" = "firefox.desktop";
+        "application/pdf" = "firefox.desktop";
+      };
+    };
+
     programs.niri.enable = true;
     programs.niri.package = pkgs.unstable.niri;
 
-    programs.niri.settings.outputs = {
+    programs.niri.settings.outputs = lib.mkIf (config.settings.host == "ti-clt-dsk01") {
       "HDMI-A-1".position = {
         x = 1920;
         y = 0;
@@ -59,13 +76,42 @@ in {
     };
 
     programs.niri.settings.workspaces = {
-      "gen" = { open-on-output = "DP-1"; };
+      "00-app" = { name = "app"; open-on-output = "DP-1"; };
-      "web" = { open-on-output = "HDMI-A-1"; };
+      "01-term" = { name = "term"; open-on-output = "DP-1"; };
-      "com" = { open-on-output = "HDMI-A-1"; };
+      "10-web" = { name = "web"; open-on-output = "HDMI-A-1"; };
-      "dev" = { open-on-output = "DP-1"; };
+      "11-mus" = { name = "mus"; open-on-output = "HDMI-A-1"; };
-      "mus" = { open-on-output = "HDMI-A-1"; };
+      "12-com" = { name = "com"; open-on-output = "HDMI-A-1"; };
     };
 
+    # Default startup applications
+    programs.niri.settings.spawn-at-startup = [
+      { command = ["vesktop"]; }
+      { command = ["thunderbird"]; }
+      { command = ["xwayland-satellite" ":10"]; }
+    ];
+
+    programs.niri.settings.environment.DISPLAY = ":10";
+    
+    programs.niri.settings.window-rules = [
+      {
+        matches = [
+          { at-startup = true; app-id = "vesktop"; }
+          { at-startup = true; app-id = "thunderbird"; }
+        ];
+        open-on-workspace = "com";
+      }
+    ];
+
+    # Configure overview
+    programs.niri.settings.layer-rules = [
+      {
+        matches = [
+          { namespace = "wallpaper"; }
+        ];
+        place-within-backdrop = true;
+      }
+    ];
+
     programs.niri.settings.binds = with config.lib.niri.actions; {
       "Mod+Shift+Slash".action = show-hotkey-overlay;
 
@@ -84,6 +130,11 @@ in {
       "XF86AudioNext".action = spawn "playerctl" "next";
       "XF86AudioPrev".action = spawn "playerctl" "previous";
 
+      # Brightness controls
+      "XF86MonBrightnessUp".action = spawn "brightnessctl" "set" "5%+";
+      "XF86MonBrightnessDown".action = spawn "brightnessctl" "set" "5%-";
+      
+
       "Mod+O".action = toggle-overview;
       "Mod+Q".action = close-window;
       "Mod+C".action = center-column;

modules/home/desktop-environments/niri/mako.nix

@@ -0,0 +1,21 @@
+{ config, pkgs, lib, inputs, ... }:
+
+with lib;
+
+let
+  cfg = config.settings.desktop-environments.niri.mako;
+in {
+  options = {
+    settings.desktop-environments.niri.mako.enable = lib.mkOption {
+      type = lib.types.bool;
+      description = ''
+        Enable mako notifiaction deamon
+      '';
+      default = config.settings.desktop-environments.niri.enable;
+    };
+  };
+
+  config = mkIf cfg.enable {
+    services.mako.enable = true;
+  };
+}

modules/home/desktop-environments/niri/swww.nix

@@ -0,0 +1,56 @@
+{ config, pkgs, lib, inputs, ... }:
+
+with lib;
+
+let
+  cfg = config.settings.desktop-environments.niri.swww;
+in {
+  options = {
+    settings.desktop-environments.niri.swww.enable = lib.mkOption {
+      type = lib.types.bool;
+      description = ''
+        Enable swww wallpapers deamon
+      '';
+      default = config.settings.desktop-environments.niri.enable;
+    };
+  };
+
+  config = mkIf cfg.enable {
+    home.packages = with pkgs; [
+      swww
+      swaybg
+    ];
+
+    systemd.user.services.swaybg = {
+      Unit = {
+        After = [ "graphical-session.target" ];
+        PartOf = [ "graphical-session.target" ];
+        Requisite = [ "graphical-session.target" ];
+        Description = "Enable swaybg wallpaper management";
+      };
+      Install = {
+        WantedBy = [ "niri.service"];
+      };
+      Service = {
+          ExecStart = ''${pkgs.swaybg}/bin/swaybg -m fill -i "%h/nix/assets/wallpaper-2-blurred.png"'';
+          Restart = ''on-failure'';
+      };
+    };
+
+    systemd.user.services.swww = {
+      Unit = {
+        After = [ "graphical-session.target" ];
+        PartOf = [ "graphical-session.target" ];
+        Requisite = [ "graphical-session.target" ];
+        Description = "Enable swww wallpaper management";
+      };
+      Install = {
+        WantedBy = [ "niri.service"];
+      };
+      Service = {
+          ExecStart = ''${pkgs.swww}/bin/swww-daemon'';
+          Restart = ''on-failure'';
+      };
+    };
+  };
+}

modules/home/desktop-environments/niri/waybar.nix

@@ -20,6 +20,7 @@ in {
   
     programs.waybar = {
       enable = true;
+      package = pkgs.unstable.waybar;
       systemd.enable = true;
     };
 
@@ -29,7 +30,6 @@ in {
         position = "top";
         modules-left = [
           "niri/workspaces"
-          "niri/window"
         ];
         modules-center = [
           "clock"
@@ -38,12 +38,90 @@ in {
           "tray"
           "network"
           "pulseaudio"
+          "battery"
         ];
+
+        "clock" = {
+          "format" = "{:%H:%M - %d}";
+        };
+
+        "tray" = {
+          "spacing" = 8;
+        };
+
+        "battery" = {
+          "bat" = "BAT1";
+          "interval" = 60;
+          "states" = {
+              "warning" = 30;
+              "critical" = 15;
+          };
+          "format" = "{icon} {capacity}%";
+          "format-icons" = [ "" "" "" "" "" ];
+        };
+
+        "pulseaudio" = {
+          "format" = "{icon} {volume}%";
+          "format-bluetooth" = "{volume}% {icon}";
+          "format-muted" = "󰝟";
+          "format-icons" = {
+              "headphone" = "";
+              "hands-free" = "";
+              "headset" = "";
+              "phone" = "";
+              "portable" = "";
+              "car" = "";
+              "default" = ["" ""];
+          };
+          "scroll-step" = 1;
+          "on-click" = "pavucontrol";
+          "ignored-sinks" = ["Easy Effects Sink"];
+        };
+
+        "network" = {
+          "interface" = "wlan0";
+          "format" = "{ifname}";
+          "format-wifi" = " {essid}";
+          "format-ethernet" = "󰊗 {ipaddr}/{cidr}";
+          "format-disconnected" = "";
+          "tooltip-format" = "{ifname} via {gwaddr}";
+          "tooltip-format-wifi" = "{essid} ({signalStrength}%)";
+          "tooltip-format-ethernet" = "{ifname}";
+          "tooltip-format-disconnected" = "Disconnected";
+          "max-length" = 50;
+        };
       };
     };
 
-    programs.waybar.style = ''
+    programs.waybar.style = /* css */''
+      #workspaces,#window,#clock,#battery,#tray,#pulseaudio,#network {
+        background-color: @base01;
+        border-radius: 10px;
+        padding: 0px 10px;
+        margin-top: 3px;
+        margin-left: 5px;
+        margin-right: 5px;
+      }
     
+      #workspaces button {
+        padding: 0 5px;
+        background: transparent;
+        color: @base05;
+        border-bottom: 2px solid transparent;
+        border-radius: 0;
+      }
+
+      window#waybar {
+        background: transparent;
+      }
+
+      #workspaces button.active {
+        border-bottom: 2px solid @base05;
+      }
+
+      #network {
+        padding: 0 5px;
+      }
     '';
   };
 }

modules/home/theming/stylix.nix

@@ -42,7 +42,11 @@ in {
     stylix.base16Scheme = lib.mkIf (cfg.theme != "theme") "${pkgs.base16-schemes}/share/themes/${cfg.theme}.yaml";
 
     stylix.autoEnable = true;
-    stylix.opacity.terminal = 0.95;
+
+    stylix.fonts.monospace = {
+      package = pkgs.nerd-fonts.dejavu-sans-mono;
+      name = "DejaVuSansM Nerd Font Propo";
+    };
 
     stylix.cursor = {
       package = pkgs.phinger-cursors;

modules/system/desktop-environments/cosmic.nix

@@ -19,7 +19,6 @@ in {
   # ];
 
   config = mkIf cfg.enable {
-    services.displayManager.cosmic-greeter.enable = true;
     services.desktopManager.cosmic.enable = true;
 
     environment.sessionVariables = {

modules/system/display-managers/default.nix

@@ -7,7 +7,7 @@ let
 in {
   options = {
     settings.display-manager = lib.mkOption {
-      type = lib.types.enum ["sddm" "cosmic-greeter" "gdm" "none"];  
+      type = lib.types.enum ["sddm" "cosmic-greeter" "gdm" "none" "greetd"];  
       description = ''
         Specify which display manager to use
       '';
@@ -18,5 +18,6 @@ in {
     ./sddm.nix
     ./cosmic-greeter.nix
     ./gdm.nix
+    ./greetd.nix
   ];
 }

modules/system/display-managers/greetd.nix

@@ -0,0 +1,35 @@
+{ lib, config, pkgs, ... }:
+
+with lib;
+
+let
+  cfg = config.settings.display-manager;
+in {
+  config = mkIf (cfg == "greetd") {
+    # systemd.services.greetd = {
+    #   serviceConfig.Type = "idle";
+    #   # unitConfig.After = [ "docker.service" ];
+    # };
+
+    systemd.services.greetd.serviceConfig = {
+      Type = "idle";
+      StandardInput = "tty";
+      StandardOutput = "tty";
+      StandardError = "journal"; # Without this errors will spam on screen
+      # Without these bootlogs will spam on screen
+      TTYReset = true;
+      TTYVHangup = true;
+      TTYVTDisallocate = true;
+    };
+
+    services.greetd = {
+      enable = true;
+      settings = {
+        default_session = {
+          command = "${pkgs.greetd.tuigreet}/bin/tuigreet --time --remember --cmd niri-session";
+          user = "greeter";
+        };
+      };
+    };
+  };
+}