fixes for a running system

flake.lock

@@ -23,11 +23,11 @@
     },
     "nixpkgs": {
       "locked": {
-        "lastModified": 1724531977,
-        "narHash": "sha256-XROVLf9ti4rrNCFLr+DmXRZtPjCQTW4cYy59owTEmxk=",
+        "lastModified": 1724727824,
+        "narHash": "sha256-0XH9MJk54imJm+RHOLTUJ7e+ponLW00tw5ke4MTVa1Y=",
         "owner": "nixos",
         "repo": "nixpkgs",
-        "rev": "2527da1ef492c495d5391f3bcf9c1dd9f4514e32",
+        "rev": "36bae45077667aff5720e5b3f1a5458f51cf0776",
         "type": "github"
       },
       "original": {
@@ -39,11 +39,11 @@
     },
     "nixpkgs-unstable": {
       "locked": {
-        "lastModified": 1724479785,
-        "narHash": "sha256-pP3Azj5d6M5nmG68Fu4JqZmdGt4S4vqI5f8te+E/FTw=",
+        "lastModified": 1724819573,
+        "narHash": "sha256-GnR7/ibgIH1vhoy8cYdmXE6iyZqKqFxQSVkFgosBh6w=",
         "owner": "nixos",
         "repo": "nixpkgs",
-        "rev": "d0e1602ddde669d5beb01aec49d71a51937ed7be",
+        "rev": "71e91c409d1e654808b2621f28a327acfdad8dc2",
         "type": "github"
       },
       "original": {

flake.nix

@@ -27,8 +27,9 @@
             home-manager.useGlobalPkgs = true;
             home-manager.useUserPackages = true;
 
-            # home-manager.extraSpecialArgs = inputs // specialArgs;
-            home-manager.users.remy = import ./users/remy.nix;
+            home-manager.users.remy.imports = [
+              ./users/remy.nix
+            ];
           }
         ];
       };

hosts/spectre-x360-2018/configuration.nix

@@ -42,6 +42,10 @@
     extraGroups = [ "wheel" ]; # Enable ‘sudo’ for the user.
   };
 
+
+  networking.networkmanager.wifi.powersave = true;
+
+  
   # For more information, see `man configuration.nix` or https://nixos.org/manual/nixos/stable/options#opt-system.stateVersion .
   system.stateVersion = "24.05"; # Did you read the comment?
 

modules/home-manager/browser.nix

@@ -1,4 +1,3 @@
-# See https://github.com/nix-community/home-manager/blob/master/modules/programs/browserpass.nix for a reference
 {pkgs, ...}:
 {
   programs.firefox = {
@@ -44,12 +43,12 @@
         "dom.security.https_only_mode" = true;
       };
 
-      # Extensions
-      extensions = with pkgs.inputs.firefox-addons; [
-        ublock-origin
-        keepassxc-browser
-        ghostery
-      ];
+      # # Extensions
+      # extensions = with pkgs.inputs.firefox-addons; [
+      #   ublock-origin
+      #   keepassxc-browser
+      #   ghostery
+      # ];
     };
   };
 }

modules/nixos/gdm.nix

@@ -18,10 +18,21 @@
         gnome-photos
         gnome-tour
         gnome.geary
-        gnome.gedit
+        gedit
         gnome.tali
         gnome.gnome-music
         gnome.cheese
-    ])
+        epiphany
+        gnome.gnome-calendar
+        gnome.gnome-maps
+        gnome.simple-scan
+        gnome.yelp
+        gnome.gnome-disk-utility
+        xterm
+        gnome.gnome-notes
+        gnome.gnome-weather
+        gnome-secrets
+        gnome.gnome-characters
+    ]);
 
 }

modules/nixos/networks.nix

@@ -1,26 +0,0 @@
-{ config, pkgs, ... }:
-
-let
-    networks = [
-        {
-            ssid = "MyNetwork1";
-            psk = "password1";
-        }
-        {
-            ssid = "MyNetwork2";
-            psk = "password2";
-        }
-        {
-            ssid = "MyNetwork3";
-            psk = "password3";
-        }
-        {
-            ssid = "MyNetwork4";
-            psk = "password4";
-        }
-    ];
-in
-
-{
-    networking.networkmanager.networks = networks;
-}

secrets/secrets.nix

@@ -0,0 +1,11 @@
+let
+
+    remy-nix = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIMU7pWZfs7GfFTvqljA99pJV9DGJIPH+eK6DvGqBs4pG";
+    remy-arch = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIOP0PZqY8/YfV0NnVbFs2fZLj+nXXVJ8bDo03TyYDfW1";
+
+    users = [remy-arch remy-nix];
+
+in {
+    "secret1.age".publicKeys = users;
+    "wifi.age".publicKeys = users;
+}

users/remy.nix

@@ -18,6 +18,7 @@
   
   ## Utils relevant to this user only
   programs.git = {
+    enable = true;
     userName = "Remy Moll";
     userEmail = "me@moll.re";
   };
@@ -32,7 +33,7 @@
           owner = "PatrickF1";
           repo = "fzf.fish";
           rev = "v10.3";
-          sha256 = "T8KYLA/r/g0KvAivKRoeqIwE2pINlxFQtZJHp0y9GMM=";
+          sha256 = "sha256-T8KYLA/r/gOKvAivKRoeqIwE2pINlxFQtZJHpOy9GMM=";
         };
       }
       # add others here
@@ -56,8 +57,8 @@
   dconf.settings = {
     # set the keyboard layout to german
     "org/gnome/desktop/input-sources" = {
-      "sources" = "[('xkb', 'de'), ('xkb', 'ch'), ('xkb', 'us')]";
-      "xkb-options" = "['lv3:ralt_switch']";
+      sources = "[('xkb', 'de'), ('xkb', 'ch'), ('xkb', 'us')]";
+      xkb-options = "['lv3:ralt_switch']";
     };
   };
 }