cleanup

a
2026-05-09 17:04:06 +03:00 · 2026-05-09 16:00:54 +03:00
16 changed files with 142 additions and 143 deletions
--- a/config/kitty/diff.conf
+++ b/config/kitty/diff.conf
@ -0,0 +1 @@
+/nix/store/p1324gwzjhbv6njfdv7wdfswgsdkv6jl-home-manager-files/.config/kitty/diff.conf
--- a/config/kitty/kitty.conf
+++ b/config/kitty/kitty.conf
@ -1,8 +0,0 @@
-background_opacity 0.3
-enable_audio_bell no
-enable_wayland_portal no
-detect_system_theme no
-# BEGIN_KITTY_THEME
-# Rosé Pine Moon
-#include current-theme.conf
-# END_KITTY_THEME
--- a/config/kitty/kitty.conf
+++ b/config/kitty/kitty.conf
@ -0,0 +1 @@
+/nix/store/p1324gwzjhbv6njfdv7wdfswgsdkv6jl-home-manager-files/.config/kitty/kitty.conf
--- a/config/kitty/kitty.conf.backup
+++ b/config/kitty/kitty.conf.backup
@ -0,0 +1,8 @@
+background_opacity 0.3
+enable_audio_bell no
+enable_wayland_portal no
+detect_system_theme no
+# BEGIN_KITTY_THEME
+# Rosé Pine Moon
+#include current-theme.conf
+# END_KITTY_THEME
--- a/flake.nix
+++ b/flake.nix
@ -71,7 +71,7 @@
        inputs.disko.nixosModules.disko
        stylix.nixosModules.stylix
        agenix.nixosModules.default
-        ./modules/home-manager/stylix.nix
+        #./modules/home-manager/stylix.nix
        {
          home-manager = {
            useGlobalPkgs = true;
@ -80,7 +80,10 @@
            backupFileExtension = "backup";

            users.tulg = {
-              imports = [./modules/home-manager/home.nix];
+              imports = [
+                ./modules/home-manager/home.nix
+                stylix.homeModules.stylix
+              ];
            };
          };
        }
@ -96,7 +99,7 @@
        inputs.disko.nixosModules.disko
        stylix.nixosModules.stylix
        agenix.nixosModules.default
-        ./modules/home-manager/stylix.nix
+        #./modules/home-manager/stylix.nix
        {
          home-manager = {
            useGlobalPkgs = true;
@ -105,7 +108,10 @@
            backupFileExtension = "backup";

            users.tulg = {
-              imports = [./modules/home-manager/home.nix];
+              imports = [
+                ./modules/home-manager/home.nix
+                stylix.homeModules.stylix
+              ];
            };
          };
        }
@ -121,7 +127,7 @@
        inputs.disko.nixosModules.disko
        agenix.nixosModules.default
        stylix.nixosModules.stylix
-        ./modules/home-manager/stylix.nix
+        #./modules/home-manager/stylix.nix
        {
          home-manager = {
            useGlobalPkgs = true;
@ -130,7 +136,10 @@
            backupFileExtension = "backup";

            users.tulg = {
-              imports = [./modules/home-manager/home.nix];
+              imports = [
+                ./modules/home-manager/home.nix
+                stylix.homeModules.stylix
+              ];
            };
          };
        }
--- a/hosts/overlord/hardware-configuration.nix
+++ b/hosts/overlord/hardware-configuration.nix
@ -24,7 +24,7 @@
  networking.useDHCP = lib.mkDefault true;
  # networking.interfaces.enp8s0.useDHCP = lib.mkDefault true;
  fileSystems."/mnt/2tbhdd" = {
-    device = "/dev/disk/by-uuid/29c2878a-6b8b-4719-addc-ed57dd647d7b";
+    device = "/dev/disk/by-uuid/4ec6fd72-a161-4944-8ad4-b727ea90d014";
    fsType = "ext4";
  };
  nixpkgs.hostPlatform = lib.mkDefault "x86_64-linux";
--- a/modules/home-manager/cli/default.nix
+++ b/modules/home-manager/cli/default.nix
@ -3,5 +3,6 @@
    ./yazi.nix
    ./shell.nix
    ./zellij.nix
+    ./fastfetch.nix
  ];
 }
--- a/modules/home-manager/cli/fastfetch.nix
+++ b/modules/home-manager/cli/fastfetch.nix
@ -0,0 +1,87 @@
+{
+  programs.fastfetch = {
+    enable = false;
+    settings = {
+      display = {
+        separator = "  ";
+      };
+      modules = [
+        {
+          type = "os";
+          key = " OS";
+          keyColor = "yellow";
+        }
+        {
+          type = "kernel";
+          key = "│ ├";
+          keyColor = "yellow";
+        }
+        {
+          type = "packages";
+          key = "│ ├󰏖";
+          keyColor = "yellow";
+        }
+        {
+          type = "shell";
+          key = "│ └";
+          keyColor = "yellow";
+        }
+        {
+          type = "wm";
+          key = " wm";
+          keyColor = "blue";
+        }
+        {
+          type = "lm";
+          key = "│ ├󰧨";
+          keyColor = "blue";
+        }
+        {
+          type = "terminal";
+          key = "│ └";
+          keyColor = "blue";
+        }
+        {
+          type = "host";
+          key = " HOST";
+          keyColor = "green";
+        }
+        {
+          type = "cpu";
+          key = "│ ├";
+          keyColor = "green";
+        }
+        {
+          type = "gpu";
+          key = "│ ├󰍛";
+          keyColor = "green";
+        }
+        {
+          type = "disk";
+          key = "│ ├";
+          keyColor = "green";
+        }
+        {
+          type = "memory";
+          key = "│ ├󰑭";
+          keyColor = "green";
+        }
+        {
+          type = "swap";
+          key = "│ ├󰓡";
+          keyColor = "green";
+        }
+        {
+          type = "uptime";
+          key = "│ ├󰅐";
+          keyColor = "green";
+        }
+        {
+          type = "display";
+          key = "│ └󰍹";
+          keyColor = "green";
+        }
+      ];
+    };
+  };
+}
--- a/modules/home-manager/cli/shell.nix
+++ b/modules/home-manager/cli/shell.nix
@ -14,7 +14,13 @@
      PS1="\[\e[38;5;177m\]\u\[\e[38;5;220m\]@\[\e[38;5;1m\]\h \[\e[38;5;33m\]\w \[\033[0m\]\$ "
    '';
  };
-
+  programs.kitty = {
+    enable = true;
+    extraConfig = ''
+      background_opacity 0.3
+      enable_audio_bell no
+    '';
+  };
  programs.git = {
    enable = true;
    settings = {
@ -22,90 +28,6 @@
      user.email = "tulg@protonmail.ch";
    };
  };
-  programs.fastfetch = {
-    enable = true;
-    settings = {
-      display = {
-        separator = "  ";
-      };
-      modules = [
-        {
-          type = "os";
-          key = " OS";
-          keyColor = "yellow";
-        }
-        {
-          type = "kernel";
-          key = "│ ├";
-          keyColor = "yellow";
-        }
-        {
-          type = "packages";
-          key = "│ ├󰏖";
-          keyColor = "yellow";
-        }
-        {
-          type = "shell";
-          key = "│ └";
-          keyColor = "yellow";
-        }
-        {
-          type = "wm";
-          key = " wm";
-          keyColor = "blue";
-        }
-        {
-          type = "lm";
-          key = "│ ├󰧨";
-          keyColor = "blue";
-        }
-        {
-          type = "terminal";
-          key = "│ └";
-          keyColor = "blue";
-        }
-        {
-          type = "host";
-          key = " HOST";
-          keyColor = "green";
-        }
-        {
-          type = "cpu";
-          key = "│ ├";
-          keyColor = "green";
-        }
-        {
-          type = "gpu";
-          key = "│ ├󰍛";
-          keyColor = "green";
-        }
-        {
-          type = "disk";
-          key = "│ ├";
-          keyColor = "green";
-        }
-        {
-          type = "memory";
-          key = "│ ├󰑭";
-          keyColor = "green";
-        }
-        {
-          type = "swap";
-          key = "│ ├󰓡";
-          keyColor = "green";
-        }
-        {
-          type = "uptime";
-          key = "│ ├󰅐";
-          keyColor = "green";
-        }
-        {
-          type = "display";
-          key = "│ └󰍹";
-          keyColor = "green";
-        }
-      ];
-    };
-  };
+
  programs.zsh.enable = true;
 }
--- a/modules/home-manager/cli/zellij.nix
+++ b/modules/home-manager/cli/zellij.nix
@ -5,7 +5,7 @@
    settings = {
      theme = "rose-pine";
      pane_frames = false;
-      default_layout = "compact";
+      show_startup_tips = false;
    };
  };
 }
--- a/modules/home-manager/desktop/symlink.nix
+++ b/modules/home-manager/desktop/symlink.nix
@ -10,10 +10,10 @@ in {
    source = link "${dots}/waybar";
    recursive = true;
  };
-  xdg.configFile."kitty" = {
-    source = link "${dots}/kitty";
-    recursive = true;
-  };
+  # xdg.configFile."kitty" = {
+  #   source = link "${dots}/kitty";
+  #   recursive = true;
+  # };
  xdg.configFile."wofi" = {
    source = link "${dots}/wofi";
    recursive = true;
@ -22,8 +22,4 @@ in {
    source = link "${dots}/mako";
    recursive = true;
  };
-  xdg.configFile."zellij" = {
-    source = link "${dots}/zellij";
-    recursive = true;
-  };
 }
--- a/modules/home-manager/desktop/vscode.nix
+++ b/modules/home-manager/desktop/vscode.nix
@ -10,7 +10,7 @@
      pkgs.vscode-extensions.jnoortheen.nix-ide
      pkgs.vscode-extensions.leonardssh.vscord
    ];
-    userSettings = {
+    profiles.default.userSettings = {
      "nix.formatterPath" = "alejandra";
      "nix.extraOptions" = ''
        experimental-features = nix-command flakes
--- a/modules/home-manager/home.nix
+++ b/modules/home-manager/home.nix
@ -8,6 +8,7 @@
    ./cli/default.nix
    ./desktop/default.nix
    ./pkgs.nix
+    ./stylix.nix
  ];
  # Home Manager settings
  nix.nixPath = ["nixpkgs=${inputs.nixpkgs}"];
--- a/modules/home-manager/pkgs.nix
+++ b/modules/home-manager/pkgs.nix
@ -12,7 +12,6 @@
    restic
    rose-pine-gtk-theme
    alejandra
-
    prismlauncher
    arc-theme
    cliphist
@ -20,7 +19,7 @@
    mpv
    vulkan-tools
    pkgs.looking-glass-client
-
+    fastfetch
    btop
    nicotine-plus
    strawberry
--- a/modules/home-manager/stylix.nix
+++ b/modules/home-manager/stylix.nix
@ -5,34 +5,27 @@
  ...
 }: {
  fonts.fontconfig.enable = true;
-  fonts.packages = with pkgs; [
-    #    noto-fonts-color-emoji
-    fira
-    fira-sans
-    fira-code
-    dejavu_fonts
-    nerd-fonts.jetbrains-mono
-    nerd-fonts.iosevka
-  ];
+  programs.kitty.font.name = "Fira Code";
  stylix = {
    enable = true;
-
+    targets.firefox.enable = false;
+    targets.zen-browser.enable = false;
    base16Scheme = "${pkgs.base16-schemes}/share/themes/rose-pine.yaml";

    fonts = {
      serif = {
        package = pkgs.fira;
-        name = "Fira Sans Regular";
+        name = "Fira Sans";
      };

      sansSerif = {
        package = pkgs.fira;
-        name = "Fira Sans Regular";
+        name = "Fira Sans";
      };

      monospace = {
-        package = pkgs.fira;
-        name = "Fira Sans Regular";
+        package = pkgs.fira-code;
+        name = "Fira Code";
      };

      emoji = {
@ -47,13 +40,5 @@
        popups = 10;
      };
    };
-
-    # targets.rofi.enable = false;
-    #    image = ../../assets/Shogoki.png;
-
-    # opacity = {
-    #   desktop = 0.5;
-    #   terminal = 0.9;
-    # };
  };
 }
--- a/modules/nixos/users/tulg.nix
+++ b/modules/nixos/users/tulg.nix
@ -1,4 +1,5 @@
 {
+  users.groups.media.gid = 169;
  users.users.tulg = {
    isNormalUser = true;
    description = "Tulga";
@ -10,6 +11,7 @@
      "wheel"
      "libvirtd"
      "kvm"
+      "media"
    ];
  };
  users.users."root".openssh.authorizedKeys.keys = [
--- a/modules/servers/per-host/overlord/share.nix
+++ b/modules/servers/per-host/overlord/share.nix
@ -1,7 +1,7 @@
 {
  fileSystems."/export/share" = {
    device = "/mnt/2tbhdd";
-    fsType = "nfs";
+    fsType = "none";
    options = ["bind"];
  };
  services.nfs.server = {
@ -12,13 +12,9 @@
    statdPort = 4000;
    extraNfsdConfig = '''';
    exports = ''
-      /export/share *(rw,sync,no_subtree_check,all_squash,insecure,anonuid=1000,anongid=100)
+      /export/share *(rw,sync,no_subtree_check)
    '';
  };
-  users.users.tulg = {
-    createHome = false;
-    shell = "/run/current-system/sw/bin/nologin";
-  };
  networking.firewall = {
    enable = true;
    # for NFSv3; view with `rpcinfo -p`
@ -29,12 +25,11 @@
    enable = true;

    shares.share = {
-      path = "/mnt/2tbhdd/smb/";
+      path = "/mnt/2tbhdd/nfs";
      browseable = "yes";
      writable = "yes";
      "guest ok" = "yes";
      "read only" = "no";
-      "force user" = "nobody";
    };
  };
 }
Author	SHA1	Message	Date
tulg	ff8ff81a4e	cleanup	2026-05-09 17:04:06 +03:00
tulg	dcf10dac05	a	2026-05-09 16:00:54 +03:00
				`@ -0,0 +1 @@`
				`/nix/store/p1324gwzjhbv6njfdv7wdfswgsdkv6jl-home-manager-files/.config/kitty/diff.conf`