nix flake update

ksevelyar · May 9, 2024 · d46914c · d46914c
1 parent 847d9bc
commit d46914c
Show file tree

Hide file tree

Showing 22 changed files with 79 additions and 167 deletions.
diff --git a/flake.lock b/flake.lock
diff --git a/flake.nix b/flake.nix
@@ -64,17 +64,17 @@
         };
       };
     in
-      {
-        nixosConfigurations = builtins.listToAttrs (
-          pkgs.lib.flatten (
-            map
-              (
-                host: [
-                  (build-target host)
-                ]
-              )
-              hosts ++ [ live-usb live-usb-min ]
-          )
-        );
-      };
+    {
+      nixosConfigurations = builtins.listToAttrs (
+        pkgs.lib.flatten (
+          map
+            (
+              host: [
+                (build-target host)
+              ]
+            )
+            hosts ++ [ live-usb live-usb-min ]
+        )
+      );
+    };
 }
diff --git a/hardware/ssd.nix b/hardware/ssd.nix
@@ -1,3 +1,3 @@
 {
-  services.fstrim.enable = true; 
+  services.fstrim.enable = true;
 }
diff --git a/hosts/catch-22.nix b/hosts/catch-22.nix
@@ -76,10 +76,10 @@ args@{ config, lib, pkgs, ... }:
       ips = [ "192.168.42.10" ];
       privateKeyFile = "/home/kh/wireguard-keys/private";
       peers = [{
-          publicKey = "dguI+imiz4FYOoxt9D/eN4Chj8wWSNlEjxKuiO9ZaAI=";
-          allowedIPs = [ "192.168.42.0/24" ];
-          endpoint = "95.165.99.133:51821";
-          persistentKeepalive = 25;
+        publicKey = "dguI+imiz4FYOoxt9D/eN4Chj8wWSNlEjxKuiO9ZaAI=";
+        allowedIPs = [ "192.168.42.0/24" ];
+        endpoint = "95.165.99.133:51821";
+        persistentKeepalive = 25;
       }];
     };
   };

diff --git a/hosts/hk47.nix b/hosts/hk47.nix
@@ -131,4 +131,10 @@ args@{ config, lib, pkgs, ... }:
     fsType = "ext4";
     options = [ "noatime" "nodiratime" ];
   };
+
+  fileSystems."/win" = {
+    device = "/dev/disk/by-label/win10";
+    fsType = "ntfs-3g";
+    options = [ "rw" "uid=1000"];
+  };
 }
diff --git a/hosts/laundry.nix b/hosts/laundry.nix
@@ -102,7 +102,7 @@ args@{ config, lib, pkgs, ... }:
     };
   };
 
-  services.xserver = {
+  services = {
     libinput = {
       enable = true;
       touchpad = {

diff --git a/hosts/pepes.nix b/hosts/pepes.nix
@@ -92,7 +92,7 @@
     # home.file.".config/alacritty/alacritty-scratchpad.toml".source = ../users/kh/alacritty-laptop/alacritty-scratchpad.toml;
   };
 
-  services.xserver = {
+  services = {
     libinput = {
       enable = true;
       touchpad = {

diff --git a/hosts/prism.nix b/hosts/prism.nix
diff --git a/hosts/sobanya.nix b/hosts/sobanya.nix
@@ -81,11 +81,12 @@ args@{ config, lib, pkgs, ... }:
     };
   };
 
+  services.displayManager = {
+    defaultSession = "none+leftwm";
+  };
+
   # x
   services.xserver = {
-    displayManager = {
-      defaultSession = "none+leftwm";
-    };
     videoDrivers = [ "nouveau" "modesetting" ];
   };
 

diff --git a/hosts/tv.nix b/hosts/tv.nix
@@ -62,9 +62,6 @@ args@{ config, lib, pkgs, ... }:
     home.file.".config/leftwm/themes/current/theme.toml".source = ../users/ksevelyar/leftwm-tv/theme.toml;
 
     home.file.".config/polybar/config".source = ../users/shared/polybar/config-big;
-    # home.file.".config/alacritty/alacritty.toml".source = ../users/ksevelyar/alacritty-tv/alacritty.toml;
-    # home.file.".config/alacritty/alacritty-scratchpad.toml".source = ../users/ksevelyar/alacritty-tv/alacritty-scratchpad.toml;
-
     home.file.".config/dunst/dunstrc".source = ../users/shared/dunst/dunstrc-big;
   };
   console.font = "${pkgs.terminus_font}/share/consolefonts/ter-u32n.psf.gz";

diff --git a/live-usb/live-usb.nix b/live-usb/live-usb.nix
@@ -1,4 +1,4 @@
-# nix build /etc/nixos#nixosConfigurations.live-usb.config.system.build.isoImage    
+# nix build /etc/nixos#nixosConfigurations.live-usb.config.system.build.isoImage
 args@{ config, pkgs, lib, ... }:
 {
   imports = [
@@ -41,10 +41,10 @@ args@{ config, pkgs, lib, ... }:
   networking.networkmanager.enable = true; # nmtui for wi-fi
   networking.wireless.enable = lib.mkForce false;
 
+  services.displayManager = {
+    autoLogin = { enable = true; user = "mrpoppybutthole"; };
+  };
   services.xserver = {
-    displayManager = {
-      autoLogin = { enable = true; user = "mrpoppybutthole"; };
-    };
     videoDrivers = [ "nvidia" "nouveau" "amdgpu" "vesa" "modesetting" ];
   };
 }
diff --git a/packages/common.nix b/packages/common.nix
@@ -6,8 +6,8 @@
     askPassword = "";
     startAgent = true;
     extraConfig = ''
-    Host *.local
-      Port 9922
+      Host *.local
+        Port 9922
     '';
   };
 

diff --git a/packages/neovim.nix b/packages/neovim.nix
@@ -11,7 +11,8 @@
 
   environment.systemPackages = with pkgs; [
     # nix
-    rnix-lsp
+    nil
+    nixpkgs-fmt
 
     # rust
     rustfmt

diff --git a/services/databases/postgresql.nix b/services/databases/postgresql.nix
@@ -3,7 +3,7 @@ let
   pg-backup = pkgs.writeScriptBin "pg-backup" ''
     #!${pkgs.stdenv.shell}
     set -e
-    
+
     backup_dir="~/.backup/pg"
     excludes='template1 template0'
 
@@ -39,14 +39,6 @@ in
       local all all trust
       host all all localhost trust
     '';
-    ensureUsers = [
-      {
-        name = "postgres";
-        ensurePermissions = {
-          "ALL TABLES IN SCHEMA public" = "ALL PRIVILEGES";
-        };
-      }
-    ];
   };
 
   environment.systemPackages = [

diff --git a/services/net/router.nix b/services/net/router.nix
@@ -11,7 +11,7 @@
 
   networking.interfaces = {
     enp3s0.useDHCP = true;
-    enp5s0.ipv4.addresses = [ { address = "192.168.0.1"; prefixLength = 24; } ];
+    enp5s0.ipv4.addresses = [{ address = "192.168.0.1"; prefixLength = 24; }];
   };
 
   networking.firewall = {

diff --git a/services/x.nix b/services/x.nix
@@ -32,19 +32,21 @@ in
   services.greenclip.enable = true;
   services.gvfs.enable = lib.mkForce false;
 
-  services.xserver = {
+  services.libinput = {
     enable = true;
-
-    libinput = {
-      enable = true;
-      touchpad = {
-        accelProfile = lib.mkDefault "adaptive";
-        disableWhileTyping = true;
-        clickMethod = "buttonareas";
-        scrollMethod = lib.mkDefault "edge";
-        naturalScrolling = false;
-      };
+    touchpad = {
+      accelProfile = lib.mkDefault "adaptive";
+      disableWhileTyping = true;
+      clickMethod = "buttonareas";
+      scrollMethod = lib.mkDefault "edge";
+      naturalScrolling = false;
     };
+  };
+
+  services.displayManager.defaultSession = lib.mkDefault "none+leftwm";
+
+  services.xserver = {
+    enable = true;
 
     config = ''
       Section "InputClass"
@@ -63,24 +65,27 @@ in
       Option "OffTime" "0"
     '';
 
-    displayManager.defaultSession = lib.mkDefault "none+leftwm";
     displayManager.lightdm = {
       enable = true;
-      greeters.enso = {
+      greeters.slick = {
         enable = true;
-        blur = false;
         theme = {
           name = "Dracula";
           package = pkgs.dracula-theme;
         };
-        iconTheme = {
-          name = "ePapirus";
-          package = pkgs.papirus-icon-theme;
-        };
         cursorTheme = {
           name = "Vanilla-DMZ";
           package = pkgs.vanilla-dmz;
         };
+
+        extraConfig = ''
+          show-hostname=false
+          show-a11y=false
+          show-power=false
+          show-keyboard=false
+          show-clock=false
+          show-quit=false
+        '';
       };
     };
 

diff --git a/sys/aliases.nix b/sys/aliases.nix
@@ -38,7 +38,7 @@
 
     # nix
     e = "nvim /etc/nixos/configuration.nix";
-    b = "sudo nixos-rebuild switch && tldr --update";
+    b = "sudo nixos-rebuild switch";
     search = "nix search nixpkgs";
     wipe-user-packages = "nix-env -e '*'";
     nix-gc = "sudo nix-collect-garbage --delete-older-than 30d";

diff --git a/sys/debug.nix b/sys/debug.nix
@@ -6,7 +6,6 @@
     wheelNeedsPassword = lib.mkForce false;
   };
 
-
   systemd.services.sshd.wantedBy = lib.mkOverride 40 [ "multi-user.target" ];
 
   services.openssh = {

diff --git a/sys/fonts.nix b/sys/fonts.nix
@@ -1,5 +1,5 @@
 # https://www.programmingfonts.org/
-{ pkgs, lib, ... }:
+{ pkgs, ... }:
 {
   fonts = {
     enableDefaultPackages = true;