services update, gnome-keyring works with this

JohnRTitor · May 29, 2024 · d31c1da · d31c1da
1 parent 4211201
commit d31c1da
Show file tree

Hide file tree

Showing 6 changed files with 73 additions and 121 deletions.
diff --git a/flake.lock b/flake.lock
diff --git a/flake.nix b/flake.nix
@@ -3,27 +3,35 @@
 
   # Main sources and repositories
   inputs = {
+    nixpkgs.url = "nixpkgs/nixos-unstable"; # Unstable NixOS system (default)
+    nixpkgs-edge.url = "nixpkgs/master"; # Only used for bleeding edge packages
+
     flake-parts = {
       url = "github:hercules-ci/flake-parts"; # Flake parts for easy flake management
       inputs.nixpkgs-lib.follows = "nixpkgs";
     };
 
-    nixpkgs.url = "nixpkgs/nixos-unstable"; # Unstable NixOS system (default)
-    nixpkgs-edge.url = "nixpkgs/master"; # Only used for bleeding edge packages
-
     # Don't add follows nixpkgs, else will cause local rebuilds
     chaotic.url = "github:chaotic-cx/nyx/nyxpkgs-unstable"; # Bleeding edge packages from chaotic nyx, especially CachyOS kernel
     devenv.url = "github:cachix/devenv"; # Devenv, for setting up development environments using devenv.nix
 
+    ## SYSTEM SERVICES ##
     home-manager = {
       url = "github:nix-community/home-manager/master"; # Home Manager, manage user configuration and home directories like a pro
       inputs.nixpkgs.follows = "nixpkgs"; # Must follow nixpkgs, else will cause conflicts with the system
     };
     lanzaboote = {
       url = "github:nix-community/lanzaboote"; # Lanzaboote module used for Secure-Boot implementation
       inputs.nixpkgs.follows = "nixpkgs";
+      inputs.flake-parts.follows = "flake-parts";
     };
+    nix-flatpak.url = "github:gmodena/nix-flatpak/v0.4.1"; # Declarative Flatpak support for NixOS
 
+    ## DESKTOP ENVIRONMENT ##
+    ags = {
+      url = "github:Aylur/ags"; # Aylur GTK Shell, a widget manager/toolkit
+      inputs.nixpkgs.follows = "nixpkgs";
+    };
     hyprland = {
       url = "git+https://github.com/hyprwm/Hyprland?submodules=1&rev=4cdddcfe466cb21db81af0ac39e51cc15f574da9"; # Hyprland, a Wayland WM, use git submodules too
       inputs.nixpkgs.follows = "nixpkgs";
@@ -33,14 +41,6 @@
       url = "github:hyprwm/xdg-desktop-portal-hyprland";
       inputs.nixpkgs.follows = "nixpkgs";
     };
-    waybar = {
-      url = "github:Alexays/Waybar"; # It's that bar you see on the top on Hyprland/Sway
-      inputs.nixpkgs.follows = "nixpkgs";
-    };
-    ags = {
-      url = "github:Aylur/ags"; # Aylur GTK Shell, a widget manager/toolkit
-      inputs.nixpkgs.follows = "nixpkgs";
-    };
     hyprcursor = {
       url = "github:hyprwm/hyprcursor"; # Forget XCursor, use Hyprcursor instead!
       inputs.nixpkgs.follows = "nixpkgs";
@@ -58,10 +58,20 @@
       inputs.nixpkgs.follows = "nixpkgs";
     };
     wallust = {
-      url = "git+https://codeberg.org/explosion-mental/wallust?ref=dev";
+      url = "git+https://codeberg.org/explosion-mental/wallust?ref=dev"; # Wallust, pywal alternative to get colors from wallpapers
+      inputs.nixpkgs.follows = "nixpkgs";
+    };
+    waybar = {
+      url = "github:Alexays/Waybar"; # It's that bar you see on the top on Hyprland/Sway
       inputs.nixpkgs.follows = "nixpkgs";
     };
 
+    ## MISC PACKAGES ##
+    bcachefs-tools = {
+      url = "github:koverstreet/bcachefs-tools";
+      inputs.nixpkgs.follows = "nixpkgs";
+      inputs.flake-parts.follows = "flake-parts";
+    };
     browser-previews = {
       url = "github:nix-community/browser-previews"; # Latest Chrome stable, beta, and dev
       inputs.nixpkgs.follows = "nixpkgs";
@@ -70,8 +80,7 @@
       url = "github:nix-community/nix-vscode-extensions"; # Grab latest VScode extensions as a package
       inputs.nixpkgs.follows = "nixpkgs";
     };
-    nix-flatpak.url = "github:gmodena/nix-flatpak/?ref=v0.4.1";
-    bcachefs-tools.url = "github:koverstreet/bcachefs-tools";
+
   };
   outputs = inputs: inputs.flake-parts.lib.mkFlake {inherit inputs;} {imports = [./flake];};
 }
diff --git a/system/fonts.nix b/system/fonts.nix
@@ -22,4 +22,13 @@
   ];
   fonts.fontDir.enable = true;
   fonts.fontconfig.subpixel.rgba = "rgb"; # Subpixel rendering
+
+  # Console fonts
+  console = {
+    font = "ter-124b";
+    keyMap = "us";
+    packages = with pkgs; [
+      terminus_font
+    ];
+  };
 }
diff --git a/system/printing.nix b/system/printing.nix
@@ -9,7 +9,7 @@ in {
   # Enable CUPS to print documents.
   services.printing = {
     enable = true;
-    cups-pdf.enable = true; # Enable PDF printing.
+    # cups-pdf.enable = true; # Enable seperate PDF printing virtual printer
     openFirewall = true; # Open ports for printing
   };
   # Enable Avahi to discover printers, and LAN devices

diff --git a/system/services/default.nix b/system/services/default.nix
@@ -67,11 +67,6 @@
   security.apparmor.enableCache = true;
   services.dbus.apparmor = "enabled";
 
-  console = {
-    font = "ter-124b";
-    keyMap = "us";
-    packages = with pkgs; [
-      terminus_font
-    ];
-  };
+  services.colord.enable = true; # For color management
+  services.gpm.enable = true; # For mouse support in tty console
 }
diff --git a/system/services/gnome-keyring.nix b/system/services/gnome-keyring.nix
@@ -1,7 +1,7 @@
 # GNOME Keyring for storing/encrypting sycrets
 # apps like vscode stores encrypted data using it
-{pkgs, ...}: {
+{...}: {
   services.gnome.gnome-keyring.enable = true;
-  security.pam.services.login.enableGnomeKeyring = true; # load gnome-keyring at startup
+  security.pam.services.gdm-password.enableGnomeKeyring = true; # load gnome-keyring at startup
   programs.seahorse.enable = true; # enable the graphical frontend for managing
 }