Update Makefile

Makefile

@@ -1,4 +1,4 @@
-.PHONY: init install link unlink rebuild update purge edit hw help
+.PHONY: init install link unlink build update purge edit hw help
 
 NIXOS_DIR := /etc/nixos
 REPO_DIR := $(shell pwd)
@@ -16,7 +16,7 @@ help:
 	@echo ""
 	@echo "  make init     - first time setup"
 	@echo "  make hw       - generate hardware-configuration.nix"
-	@echo "  make rebuild  - rebuild nixos configuration"
+	@echo "  make build    - build nixos configuration"
 	@echo "  make update   - update flake inputs and rebuild"
 	@echo "  make purge    - garbage collect"
 	@echo "  make link     - symlink to /etc/nixos"
@@ -48,8 +48,7 @@ unlink:
 		echo "/etc/nixos is not a symlink"; \
 	fi
 
-rebuild:
+build:
-	@# Ensure hardware-configuration.nix is tracked by git (flake requirement), even if ignored
 	@if [ -f hardware-configuration.nix ]; then \
 		git add -f -N hardware-configuration.nix; \
 	fi

README.md

@@ -1,4 +1,4 @@
-# Lavitz - My personal NixOS config named after Lavitz from the PS1 classic The Legend of Dragoon
+# Lavitz - My NixOS desktop configuration named after Lavitz from the PS1 classic The Legend of Dragoon
 
 - Nix Version: 25.11
 - DE: Gnome

common.nix

@@ -16,7 +16,7 @@
   ];
 
   nix.settings.experimental-features = [ "nix-command" "flakes" ];
-  # xdg.portal.config.common.default = [ "gnome" ];
+  # xdg.portal.config.common.default = [ "cosmic" ];
 
   system.stateVersion = "25.11";
 }

configuration.nix

@@ -1,4 +1,4 @@
-{ config, pkgs, ... }:
+{ ... }:
 
 {
   imports = [
@@ -17,8 +17,10 @@
     ./modules/home.nix
   ];
 
-  nix.settings.experimental-features = [ "nix-command" "flakes" ];
+  nix.settings.experimental-features = [
-  # xdg.portal.config.common.default = [ "gnome" ];
+    "nix-command"
+    "flakes"
+  ];
 
   system.stateVersion = "25.11";
 }

flake.lock

@@ -1,5 +1,50 @@
 {
   "nodes": {
+    "cosmic-manager": {
+      "inputs": {
+        "flake-parts": "flake-parts",
+        "home-manager": [
+          "home-manager"
+        ],
+        "nixpkgs": [
+          "nixpkgs"
+        ]
+      },
+      "locked": {
+        "lastModified": 1765831383,
+        "narHash": "sha256-P5F/VPjjGw7s0AOTPb3z3gxqtH0YkAnd/c9P6QdWrEU=",
+        "owner": "HeitorAugustoLN",
+        "repo": "cosmic-manager",
+        "rev": "819d4d21fb90460dd11416d81d2cff65a53b8a59",
+        "type": "github"
+      },
+      "original": {
+        "owner": "HeitorAugustoLN",
+        "repo": "cosmic-manager",
+        "type": "github"
+      }
+    },
+    "flake-parts": {
+      "inputs": {
+        "nixpkgs-lib": [
+          "cosmic-manager",
+          "nixpkgs"
+        ]
+      },
+      "locked": {
+        "lastModified": 1759362264,
+        "narHash": "sha256-wfG0S7pltlYyZTM+qqlhJ7GMw2fTF4mLKCIVhLii/4M=",
+        "owner": "hercules-ci",
+        "repo": "flake-parts",
+        "rev": "758cf7296bee11f1706a574c77d072b8a7baa881",
+        "type": "github"
+      },
+      "original": {
+        "owner": "hercules-ci",
+        "repo": "flake-parts",
+        "type": "github"
+      }
+    },
     "home-manager": {
       "inputs": {
         "nixpkgs": [
@@ -7,11 +52,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1769580047,
+        "lastModified": 1772302941,
-        "narHash": "sha256-tNqCP/+2+peAXXQ2V8RwsBkenlfWMERb+Uy6xmevyhM=",
+        "narHash": "sha256-TL3+ckbOTILXrR0qSK3dJj2BJ0S5yz/YSsUF1oEgd9g=",
         "owner": "nix-community",
         "repo": "home-manager",
-        "rev": "366d78c2856de6ab3411c15c1cb4fb4c2bf5c826",
+        "rev": "9b9142b5fe214c2adabe86257c33e022372b7c96",
         "type": "github"
       },
       "original": {
@@ -23,11 +68,11 @@
     },
     "nixpkgs": {
       "locked": {
-        "lastModified": 1770136044,
+        "lastModified": 1772047000,
-        "narHash": "sha256-tlFqNG/uzz2++aAmn4v8J0vAkV3z7XngeIIB3rM3650=",
+        "narHash": "sha256-7DaQVv4R97cii/Qdfy4tmDZMB2xxtyIvNGSwXBBhSmo=",
         "owner": "nixos",
         "repo": "nixpkgs",
-        "rev": "e576e3c9cf9bad747afcddd9e34f51d18c855b4e",
+        "rev": "1267bb4920d0fc06ea916734c11b0bf004bbe17e",
         "type": "github"
       },
       "original": {
@@ -37,10 +82,28 @@
         "type": "github"
       }
     },
+    "nixpkgs-unstable": {
+      "locked": {
+        "lastModified": 1771848320,
+        "narHash": "sha256-0MAd+0mun3K/Ns8JATeHT1sX28faLII5hVLq0L3BdZU=",
+        "owner": "nixos",
+        "repo": "nixpkgs",
+        "rev": "2fc6539b481e1d2569f25f8799236694180c0993",
+        "type": "github"
+      },
+      "original": {
+        "owner": "nixos",
+        "ref": "nixos-unstable",
+        "repo": "nixpkgs",
+        "type": "github"
+      }
+    },
     "root": {
       "inputs": {
+        "cosmic-manager": "cosmic-manager",
         "home-manager": "home-manager",
-        "nixpkgs": "nixpkgs"
+        "nixpkgs": "nixpkgs",
+        "nixpkgs-unstable": "nixpkgs-unstable"
       }
     }
   },

flake.nix

@@ -1,23 +1,39 @@
 {
-  description = "NixOS Configuration";
+  description = "Lavitz Configuration";
 
   inputs = {
     nixpkgs.url = "github:nixos/nixpkgs/nixos-25.11";
+    nixpkgs-unstable.url = "github:nixos/nixpkgs/nixos-unstable";
+
     home-manager = {
       url = "github:nix-community/home-manager/release-25.11";
       inputs.nixpkgs.follows = "nixpkgs";
     };
+    cosmic-manager = {
+      url = "github:HeitorAugustoLN/cosmic-manager";
+      inputs = {
+        nixpkgs.follows = "nixpkgs";
+        home-manager.follows = "home-manager";
+      };
+    };
   };
 
-  outputs = { self, nixpkgs, home-manager, ... }@inputs:
+  outputs = { self, nixpkgs, nixpkgs-unstable, home-manager, ... }@inputs:
     let
       settings = import ./settings.nix;
       system = "x86_64-linux";
+      overlay-unstable = final: prev: {
+        unstable = import nixpkgs-unstable {
+          inherit system;
+          config.allowUnfree = true;
+        };
+      };
     in {
     nixosConfigurations."${settings.hostname}" = nixpkgs.lib.nixosSystem {
       inherit system;
       specialArgs = { inherit inputs; };
       modules = [
+        ({ config, pkgs, ... }: { nixpkgs.overlays = [ overlay-unstable ]; })
         ./configuration.nix
         home-manager.nixosModules.home-manager
       ];

modules/audio.nix

@@ -1,4 +1,4 @@
-{ config, pkgs, ... }:
+{ pkgs, ... }:
 
 {
   security.rtkit.enable = true;
@@ -12,22 +12,23 @@
     wireplumber.enable = true;
   };
 
-  # Main Pipewire graph configuration
+  # Elgato makes shit products and they should feel bad :c
-  services.pipewire.extraConfig.pipewire."92-low-latency" = {
+  services.pipewire.wireplumber.extraConfig."51-wave3" = {
-    "context.properties" = {
+    "monitor.alsa.rules" = [
-      "default.clock.rate" = 48000;
+      {
-      "default.clock.quantum" = 1024;
+        matches = [
-      "default.clock.min-quantum" = 32;
+          {
-      "default.clock.max-quantum" = 8192;
+            "node.name" = "~alsa_input.usb-Elgato_Systems_Elgato_Wave_3.*";
+          }
+        ];
+        actions = {
+          update-props = {
+            "session.suspend-timeout-seconds" = 0;
+            "node.pause-on-idle" = false;
           };
         };
-
+      }
-  # PulseAudio protocol specific tweaks (Crucial for Steam/Proton)
+    ];
-  services.pipewire.extraConfig.pipewire-pulse."92-pulse-tweaks" = {
-    "pulse.properties" = {
-      "pulse.min.req" = "1024/48000";
-      "pulse.min.quantum" = "1024/48000";
-    };
   };
 
   # DeepFilterNet noise reduction filter chain

modules/boot.nix

@@ -1,4 +1,4 @@
-{ config, pkgs, ... }:
+{ pkgs, ... }:
 
 {
   boot.loader.systemd-boot = {
@@ -8,10 +8,15 @@
   };
   boot.loader.efi.canTouchEfiVariables = true;
 
+  boot.consoleLogLevel = 3;
   boot.kernelPackages = pkgs.linuxPackages_latest;
   boot.kernelModules = [ "tcp_bbr" ];
   boot.initrd.kernelModules = [ "amdgpu" ];
-  boot.kernelParams = [ "preempt=full" ];
+  boot.kernelParams = [
+    "preempt=full"
+    "quiet"
+    "udev.log_priority=3"
+  ];
 
   boot.tmp.useTmpfs = true;
   boot.tmp.tmpfsSize = "4G";

modules/desktop.nix

@@ -1,10 +1,14 @@
-{ config, pkgs, ... }:
+{ pkgs, ... }:
 
 {
-  services.displayManager.gdm.enable = true;
+  services.xserver.enable = true;
-  services.desktopManager.gnome.enable = true;
 
-  environment.gnome.excludePackages = with pkgs; [ gnome-tour gnome-user-docs gnome-console epiphany ];
+  services.desktopManager.gnome.enable = true;
+  services.displayManager.gdm.enable = true;
 
   services.printing.enable = true;
+
+  environment.gnome.excludePackages = with pkgs; [
+    epiphany
+  ];
 }

modules/hardware.nix

@@ -1,4 +1,4 @@
-{ config, pkgs, ... }:
+{ ... }:
 
 {
   hardware.graphics = {

modules/home.nix

@@ -1,8 +1,9 @@
-{ config, pkgs, ... }:
+{ inputs, ... }:
 
 let
   settings = import ../settings.nix;
   homeModules = [
+    inputs.cosmic-manager.homeManagerModules.cosmic-manager
     ./home/session.nix
     ./home/packages.nix
     ./home/git.nix
@@ -11,7 +12,7 @@ let
     ./home/librewolf.nix
     ./home/zed.nix
     ./home/ghostty.nix
-    ./home/syncthing.nix
+    ./home/ssh.nix
   ];
 in
 {
@@ -24,8 +25,13 @@ in
     inherit settings;
   };
 
-  home-manager.users.${settings.username} = { ... }: {
+  home-manager.users.${settings.username} =
+    { config, ... }:
+    {
       imports = homeModules;
       home.stateVersion = "25.11";
+      home.sessionVariables = {
+        SSH_AUTH_SOCK = "${config.home.homeDirectory}/.bitwarden-ssh-agent.sock";
+      };
     };
 }

modules/home/cli.nix

@@ -1,15 +1,17 @@
-{ pkgs, ... }:
+{ ... }:
 
 {
   home.shellAliases = {
     # Nix Commands
-    "nix:rebuild" = "sudo nixos-rebuild switch";
+    "nix:build" = "sudo nixos-rebuild switch --flake /etc/nixos";
-    "nix:update" = "sudo nixos-rebuild switch --upgrade";
+    "nix:update" = "cd /etc/nixos && nix flake update && sudo nixos-rebuild switch --flake .";
-    "nix:purge" = "sudo nix-collect-garbage -d && sudo /run/current-system/bin/switch-to-configuration boot";
+    "nix:purge" =
+      "sudo nix-collect-garbage -d && sudo /run/current-system/bin/switch-to-configuration boot";
     "nix:edit" = "$EDITOR /etc/nixos";
     "nix:push" = "cd /etc/nixos && git add -A && git commit -m \"$(date -u +%s)\" && git push";
     "nix:pull" = "cd /etc/nixos && git pull";
-    "nix:hw" = "sudo nixos-generate-config --show-hardware-config > /etc/nixos/hardware-configuration.nix";
+    "nix:hw" =
+      "sudo nixos-generate-config --show-hardware-config > /etc/nixos/hardware-configuration.nix";
 
     # Utilities
     "fixaudio" = "systemctl --user restart pipewire pipewire-pulse wireplumber";

modules/home/gnome.nix

@@ -6,6 +6,8 @@
       color-scheme = "prefer-dark";
       accent-color = "pink";
       clock-show-weekday = true;
+      clock-show-date = true;
+      clock-format = "12h";
     };
 
     "org/gnome/system/location" = {

modules/home/librewolf.nix

@@ -10,6 +10,8 @@
       DisableFirefoxStudies = true;
       DisablePocket = true;
       DisableFirefoxAccounts = true;
+      OfferToSaveLogins = false;
+      EnableTrackingProtection = true;
 
       FirefoxHome = {
         Search = true;
@@ -23,12 +25,41 @@
       SanitizeOnShutdown = {
         Cache = true;
         Cookies = false;
-        History = true;
+        History = false;
         Sessions = true;
         SiteSettings = false;
         OfflineApps = true;
       };
 
+      SearchEngines = {
+        Default = "Searx Search";
+        Remove = [
+          "Google"
+          "Bing"
+          "Perplexity"
+          "Wikipedia (en)"
+        ];
+        Add = [
+          {
+            Name = "Searx Search";
+            URLTemplate = "https://search.atri.dad/search?q={searchTerms}";
+            Method = "GET";
+            IconURL = "https://search.atri.dad/favicon.ico";
+            Alias = "searx";
+            Description = "Searx (search.atri.dad)";
+          }
+          {
+            Name = "DuckDuckGo";
+            URLTemplate = "https://duckduckgo.com/?q={searchTerms}";
+            SuggestURLTemplate = "https://duckduckgo.com/ac/?q={searchTerms}&type=list";
+            Method = "GET";
+            IconURL = "https://duckduckgo.com/favicon.ico";
+            Alias = "ddg";
+            Description = "DuckDuckGo";
+          }
+        ];
+      };
+
       ExtensionSettings = {
         # Bitwarden
         "{446900e4-71c2-419f-a6a7-df9c091e268b}" = {
@@ -47,28 +78,46 @@
           install_url = "https://addons.mozilla.org/firefox/downloads/latest/ublock-origin/latest.xpi";
           installation_mode = "force_installed";
         };
-
-        # Catppuccin Theme
-        "{15cb5e64-94bd-41aa-91cf-751bb1a84972}" = {
-          install_url = "https://addons.mozilla.org/firefox/downloads/latest/catppuccin-macchiato-lavender2/latest.xpi";
-          installation_mode = "force_installed";
-        };
       };
 
       Preferences = {
         "browser.startup.homepage" = "about:home";
         "extensions.autoDisableScopes" = 0;
-
         "browser.toolbars.bookmarks.visibility" = "always";
-
         "network.cookie.cookieBehavior" = 1;
-        "privacy.clearOnShutdown.cookies" = false;
+        "browser.safebrowsing.malware.enabled" = false;
-        "privacy.clearOnShutdown.history" = false;
+        "browser.safebrowsing.phishing.enabled" = false;
+        "browser.safebrowsing.blockedURIs.enabled" = false;
+        "browser.safebrowsing.downloads.enabled" = false;
+        "browser.safebrowsing.provider.google4.gethashURL" = "";
+        "browser.safebrowsing.provider.google4.updateURL" = "";
+        "browser.safebrowsing.provider.google.gethashURL" = "";
+        "browser.safebrowsing.provider.google.updateURL" = "";
+        "browser.newtabpage.activity-stream.newtabWallpapers.wallpaper" = "dark-mountain";
+
+        "extensions.activeThemeID" = {
+          Value = "firefox-alpenglow@mozilla.org";
+          Status = "locked";
+        };
+
+        "privacy.resistFingerprinting" = {
+          Value = true;
+          Status = "locked";
+        };
+
+        "browser.ml.chat.enabled" = {
+          Value = false;
+          Status = "locked";
+        };
+        "browser.ml.chat.sidebar" = {
+          Value = false;
+          Status = "locked";
+        };
+        "browser.tabs.groups.smart.userEnabled" = {
+          Value = false;
+          Status = "locked";
+        };
 
-        "sidebar.revamp" = true;
-        "sidebar.verticalTabs" = true;
-        "sidebar.main.tools" = "bookmarks,history,tabs";
-        "sidebar.visibility" = "always";
       };
     };
   };

modules/home/packages.nix

@@ -2,10 +2,6 @@
 
 {
   home.packages = with pkgs; [
-    # Browsers and comms
-    discord
-    signal-desktop
-
     # Development tools
     gnumake
     openssh
@@ -17,6 +13,12 @@
     pavucontrol
     texliveFull
     texlab
+    nil
+    nixd
+
+    # CLI
+    bitwarden-cli
+    tea
 
     # Desktop applications
     bitwarden-desktop
@@ -24,16 +26,17 @@
     streamrip
     cider-2
     zotero
-    prismlauncher
     lrcget
     impression
     streamcontroller
     onlyoffice-desktopeditors
+    gnome-keyring
     pinta
-
+    discord
-    # GNOME Extensions
+    signal-desktop
-    gnomeExtensions.appindicator
+    element-desktop
-    gnomeExtensions.gamemode-shell-extension
+    unstable.fastmail-desktop
+    supersonic
   ];
 
   programs.obs-studio.enable = true;

modules/home/session.nix

@@ -1,4 +1,4 @@
-{ config, ... }:
+{ ... }:
 
 {
   home.file."Assets" = {
@@ -6,8 +6,7 @@
     force = true;
   };
 
-  home.sessionVariables = {
+  systemd.user.sessionVariables = {
     BROWSER = "librewolf";
-    SSH_AUTH_SOCK = "${config.home.homeDirectory}/.bitwarden-ssh-agent.sock";
   };
 }

modules/home/ssh.nix

@@ -0,0 +1,34 @@
+{ ... }:
+
+{
+  programs.ssh = {
+    enable = true;
+    enableDefaultConfig = false;
+    matchBlocks = {
+      "*" = {
+        identityAgent = "~/.bitwarden-ssh-agent.sock";
+      };
+      "localhost" = {
+        extraOptions.UserKnownHostsFile = "/dev/null";
+      };
+      "tux" = {
+        hostname = "tuxworld.usask.ca";
+        user = "atl175";
+      };
+      "haschel" = {
+        hostname = "haschel";
+        user = "fedora";
+      };
+      "lloyd" = {
+        hostname = "lloyd";
+        user = "truenas_admin";
+      };
+    };
+  };
+
+  xdg.configFile."autostart/gnome-keyring-ssh.desktop".text = ''
+    [Desktop Entry]
+    Type=Application
+    Hidden=true
+  '';
+}

modules/home/syncthing.nix

@@ -1,7 +0,0 @@
-{ config, pkgs, ... }:
-
-{
-  services.syncthing = {
-    enable = true;
-  };
-}

modules/home/zed.nix

@@ -1,4 +1,4 @@
-{ pkgs, ... }:
+{ ... }:
 
 {
   programs.zed-editor = {
@@ -44,7 +44,10 @@
 
       languages = {
         "Nix" = {
-          language_servers = [ "nil" "nixd" ];
+          language_servers = [
+            "nil"
+            "nixd"
+          ];
           format_on_save = "on";
         };
       };

modules/locale.nix

@@ -1,4 +1,4 @@
-{ config, pkgs, ... }:
+{ ... }:
 
 let
   settings = import ../settings.nix;

modules/networking.nix

@@ -1,4 +1,4 @@
-{ config, pkgs, ... }:
+{ ... }:
 
 let
   settings = import ../settings.nix;
@@ -17,19 +17,27 @@ in
     # Allowed ports
     allowedTCPPorts = [
       # SyncThing
-      8384 22000
+      8384
+      22000
     ];
     allowedUDPPorts = [
 
       # SyncThing
-      22000 21027
+      22000
+      21027
     ];
   };
 
-  networking.nameservers = [ "1.1.1.1" "9.9.9.9" ];
+  networking.nameservers = [
+    "1.1.1.1"
+    "9.9.9.9"
+  ];
   services.resolved = {
     enable = true;
     dnsovertls = "opportunistic";
-    fallbackDns = [ "1.0.0.1" "149.112.112.112" ];
+    fallbackDns = [
+      "1.0.0.1"
+      "149.112.112.112"
+    ];
   };
 }

modules/programs.nix

@@ -1,4 +1,4 @@
-{ config, pkgs, ... }:
+{ pkgs, ... }:
 
 {
   # Enable unfree globally

modules/services.nix

@@ -1,10 +1,6 @@
-{ config, pkgs, ... }:
+{ pkgs, ... }:
 
-let
-  settings = import ../settings.nix;
-in
 {
-  # Hardened OpenSSH
   services.openssh = {
     enable = true;
     ports = [ 22 ];

modules/users.nix

@@ -1,4 +1,4 @@
-{ config, pkgs, ... }:
+{ ... }:
 
 let
   settings = import ../settings.nix;