Merge branch 'master' of https://git.dhilton.xyz/k/nixos_configs

flake.lock

@@ -191,11 +191,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1725180166,
+        "lastModified": 1726611255,
-        "narHash": "sha256-fzssXuGR/mCeGbzM1ExaTqDz7QDGta3WA4jJsZyRruo=",
+        "narHash": "sha256-/bxaYvIK6/d3zqpW26QFS0rqfd0cO4qreSNWvYLTl/w=",
         "owner": "nix-community",
         "repo": "home-manager",
-        "rev": "471e3eb0a114265bcd62d11d58ba8d3421ee68eb",
+        "rev": "d2493de5cd1da06b6a4c3e97f4e7d5dd791df457",
         "type": "github"
       },
       "original": {
@@ -227,11 +227,11 @@
     },
     "nixos-hardware": {
       "locked": {
-        "lastModified": 1725477728,
+        "lastModified": 1726650330,
-        "narHash": "sha256-ahej1VRqKmWbG7gewty+GlrSBEeGY/J2Zy8Nt8+3fdg=",
+        "narHash": "sha256-UbHzmaOQ18O/kCizipU70N0UQVFIfv8AiFKXw07oZ9Y=",
         "owner": "NixOS",
         "repo": "nixos-hardware",
-        "rev": "880be1ab837e1e9fe0449dae41ac4d034694d4ce",
+        "rev": "abb448608a56a60075468e90d8acec2a7cb689b1",
         "type": "github"
       },
       "original": {
@@ -243,11 +243,11 @@
     },
     "nixpkgs": {
       "locked": {
-        "lastModified": 1725432240,
+        "lastModified": 1726463316,
-        "narHash": "sha256-+yj+xgsfZaErbfYM3T+QvEE2hU7UuE+Jf0fJCJ8uPS0=",
+        "narHash": "sha256-gI9kkaH0ZjakJOKrdjaI/VbaMEo9qBbSUl93DnU7f4c=",
         "owner": "nixos",
         "repo": "nixpkgs",
-        "rev": "ad416d066ca1222956472ab7d0555a6946746a80",
+        "rev": "99dc8785f6a0adac95f5e2ab05cc2e1bf666d172",
         "type": "github"
       },
       "original": {
@@ -298,11 +298,11 @@
         "systems": "systems"
       },
       "locked": {
-        "lastModified": 1725290973,
+        "lastModified": 1726497442,
-        "narHash": "sha256-+jwXF9KI0HfvDgpsoJGvOdfOGGSKOrID1wQB79zjUbo=",
+        "narHash": "sha256-fieyqmLEJQqqnuJcg2CAnQ8kHapXHhg9rL48NNWjnPw=",
         "owner": "danth",
         "repo": "stylix",
-        "rev": "ef81ad9e85e60420cc83d4642619c14b57139d33",
+        "rev": "149b313ddf91c3cc94309170498b162cec666675",
         "type": "github"
       },
       "original": {

hosts/home/gnome.nix

@@ -0,0 +1,25 @@
+{ config, pkgs, inputs, ... }:
+
+{
+  # ...
+  dconf.settings = {
+    # ...
+    "org/gnome/shell" = {
+      disable-user-extensions = false;
+
+      # `gnome-extensions list` for a list
+      enabled-extensions = [
+        "Vitals@CoreCoding.com"
+	"blur-my-shell@aunetx"
+	"search-light@icedman.github.com"
+      ];
+    };
+  };
+
+  home.packages = with pkgs; [
+    gnomeExtensions.vitals
+    gnomeExtensions.blur-my-shell
+    gnomeExtensions.search-light
+  ];
+}
+

hosts/home/home_common.nix

@@ -0,0 +1,35 @@
+{ config, pkgs, inputs, ... }:
+
+{
+  home = {
+    username = "k";
+    homeDirectory = "/home/k";
+    stateVersion = "23.11";
+    enableNixpkgsReleaseCheck = false;
+  };
+  programs = {
+    git = {
+      enable = true;
+      userName = "k";
+      userEmail = "markers711@gmail.com";
+    };
+    starship.enable = true;
+    zsh = {
+      enable = true;
+      autosuggestion.enable = true;
+      enableCompletion = true;
+      syntaxHighlighting.enable = true;
+      autocd = true;
+      plugins = [{
+        name = "zsh-nix-shell";
+        file = "nix-shell.plugin.zsh";
+        src = pkgs.fetchFromGitHub {
+          owner = "chisui";
+          repo = "zsh-nix-shell";
+          rev = "v0.8.0";
+          sha256 = "1lzrn0n4fxfcgg65v0qhnj7wnybybqzs4adz7xsrkgmcsr0ii8b7";
+        };
+      }];
+    };
+  };
+}

hosts/laptop/configuration.nix

@@ -58,7 +58,11 @@
     enable = true;
     polarity = "light";
     image = ./wallpaper.png;
-    base16Scheme = "${pkgs.base16-schemes}/share/themes/rose-pine-dawn.yaml";
+    base16Scheme = "${pkgs.base16-schemes}/share/themes/brushtrees.yaml";
+    opacity = {
+    terminal = .85;
+    popups = .75;
+    };
     cursor = {
       package = pkgs.adwaita-icon-theme;
       name = "Adwaita";
@@ -95,6 +99,7 @@
   };
 
   home-manager = {
+    backupFileExtension = "bk";
     users = { "k" = import ./home.nix; };
   };
 
@@ -105,16 +110,11 @@
       gnome-tour
       xterm
       cheese # webcam tool
-      gnome-music
-      gnome-weather
-      gnome-calendar
       gnome-contacts
       gnome-clocks
       gnome-maps
-      epiphany # web browser
       geary # email reader
       evince # document viewer
-      gnome-characters
       totem # video player
       tali # poker game
       iagno # go game
@@ -130,6 +130,24 @@
     ];
   };
 
+  boot = {
+
+    plymouth = { enable = true; };
+
+    consoleLogLevel = 0;
+    initrd.verbose = false;
+    kernelParams = [
+      "quiet"
+      "splash"
+      "boot.shell_on_fail"
+      "loglevel=3"
+      "rd.systemd.show_status=false"
+      "rd.udev.log_level=3"
+      "udev.log_priority=3"
+    ];
+    loader.timeout = 0;
+  };
+
   # This value determines the NixOS release from which the default
   # settings for stateful data, like file locations and database versions
   # on your system were taken. It‘s perfectly fine and recommended to leave

hosts/laptop/hardware-configuration.nix

@@ -4,28 +4,26 @@
 { config, lib, pkgs, modulesPath, ... }:
 
 {
-  imports =
+  imports = [ (modulesPath + "/installer/scan/not-detected.nix") ];
-    [ (modulesPath + "/installer/scan/not-detected.nix")
-    ];
 
-  boot.initrd.availableKernelModules = [ "xhci_pci" "thunderbolt" "nvme" "usb_storage" "sd_mod" ];
+  boot.initrd.availableKernelModules =
+    [ "xhci_pci" "thunderbolt" "nvme" "usb_storage" "sd_mod" ];
   boot.initrd.kernelModules = [ ];
   boot.kernelModules = [ "kvm-intel" ];
   boot.extraModulePackages = [ ];
 
-  fileSystems."/" =
+  fileSystems."/" = {
-    { device = "/dev/disk/by-uuid/a7301069-c11f-411e-9a23-446744c3ae76";
+    device = "/dev/disk/by-uuid/a7301069-c11f-411e-9a23-446744c3ae76";
     fsType = "ext4";
   };
 
-  fileSystems."/boot" =
+  fileSystems."/boot" = {
-    { device = "/dev/disk/by-uuid/19F3-CD7E";
+    device = "/dev/disk/by-uuid/19F3-CD7E";
     fsType = "vfat";
   };
 
   swapDevices =
-    [ { device = "/dev/disk/by-uuid/d9df94a1-5088-468c-839d-f4cd10cb7e5f"; }
+    [{ device = "/dev/disk/by-uuid/d9df94a1-5088-468c-839d-f4cd10cb7e5f"; }];
-    ];
 
   # Enables DHCP on each ethernet and wireless interface. In case of scripted networking
   # (the default) this is the recommended approach. When using systemd-networkd it's
@@ -35,7 +33,8 @@
   # networking.interfaces.wlp0s20f3.useDHCP = lib.mkDefault true;
 
   nixpkgs.hostPlatform = lib.mkDefault "x86_64-linux";
-  hardware.cpu.intel.updateMicrocode = lib.mkDefault config.hardware.enableRedistributableFirmware;
+  hardware.cpu.intel.updateMicrocode =
+    lib.mkDefault config.hardware.enableRedistributableFirmware;
 
   # Bootloader.
   boot.loader.systemd-boot.enable = true;

hosts/laptop/home.nix

@@ -1,13 +1,16 @@
 { config, pkgs, inputs, ... }:
 
 {
+  imports = [
+     ../home/home_common.nix
+     ../home/gnome.nix
+  ];
+
+  stylix.enable = true;
+
   nixpkgs.config.allowUnfree = true;
   
   home = {
-    username = "k";
-    homeDirectory = "/home/k";
-    stateVersion = "23.11";
-    enableNixpkgsReleaseCheck = false;
     packages = with pkgs; [
       nerdfonts
       firefox
@@ -22,40 +25,17 @@
 
       modrinth-app
       direnv
+      emacs
+      syncthing
     ];
   };
 
   programs = {
-    git = {
-      enable = true;
-      userName = "k";
-      userEmail = "markers711@gmail.com";
-    };
-
     direnv = {
       enable = true;
       enableZshIntegration = true;
       nix-direnv.enable = true;
     };
-
-    starship.enable = true;
-    zsh = {
-      enable = true;
-      autosuggestion.enable = true;
-      enableCompletion = true;
-      syntaxHighlighting.enable = true;
-      autocd = true;
-      plugins = [{
-        name = "zsh-nix-shell";
-        file = "nix-shell.plugin.zsh";
-        src = pkgs.fetchFromGitHub {
-          owner = "chisui";
-          repo = "zsh-nix-shell";
-          rev = "v0.8.0";
-          sha256 = "1lzrn0n4fxfcgg65v0qhnj7wnybybqzs4adz7xsrkgmcsr0ii8b7";
-        };
-      }];
-    };
   };
 
   services = {