meow

2025-09-22 20:55:16 +00:00
parent 2c60fdb0f9
commit 2e94f6dac3
71 changed files with 88 additions and 16 deletions
@@ -1,2 +1,3 @@
 nix/result
 nix/nixos.qcow2
+nix_file.tar.gz
@@ -1,8 +1,10 @@
 keys:
  - &doloro-desktop age1ykcy2r4kk729e7adqxu8s24ujc60z5eux7ma0ca4ruzydwgm5p6qmdp838 
+  - &doloro-doloro-desktop age1e6vws55p0g23qzthm4qa93hpt6lqmck6670gkygph0sc0j7my4uq5wqjfh
 creation_rules:
  - path_regex: secrets/.+\.(yaml|json|env|ini|bin)$
    key_groups:
    - age:
      - *doloro-desktop
+      - *doloro-doloro-desktop

@@ -9,11 +9,20 @@
    [ # Include the results of the hardware scan.
      ./hardware-configuration.nix
 			./modules/greetd/nixos.nix
+	./disks.nix
    ];

  # Use the systemd-boot EFI boot loader.
-  boot.loader.systemd-boot.enable = true;
-  boot.loader.efi.canTouchEfiVariables = true;
+  boot.loader.grub.enable = true;
+  boot.loader.grub.device = "nodev";
+  boot.loader.grub.devices = ["/dev/disk/by-id/nvme-CT1000P2SSD8_2221E632CD1F"
+  "nodev"
+];
+  #boot.loader.efi.canTouchEfiVariables = true;
+  boot.loader.grub.efiSupport = true;
+  boot.loader.grub.efiInstallAsRemovable = true;
+
+  nix.settings.experimental-features = ["flakes" "nix-command"];

  # networking.hostName = "nixos"; # Define your hostname.

@@ -50,6 +59,7 @@
  # Enable the X11 windowing system.
  # services.xserver.enable = true;

+  programs.hyprland.enable = true;

  

@@ -63,10 +73,10 @@
  # Enable sound.
  # services.pulseaudio.enable = true;
  # OR
-  # services.pipewire = {
-  #   enable = true;
-  #   pulse.enable = true;
-  # };
+  services.pipewire = {
+    enable = true;
+    pulse.enable = true;
+  };

  # Enable touchpad support (enabled default in most desktopManager).
  # services.libinput.enable = true;
@@ -79,7 +89,7 @@
    ];
  };
 	users.mutableUsers = false;
-	# users.users.doloro.hashedPasswordFile = config.sops.secrets."doloro-hashed_password".path;
+	users.users.doloro.hashedPasswordFile = config.sops.secrets."doloro-hashed_password".path;
 	# users.users.root.hashedPasswordFile = config.sops.secrets."root-hashed_password".path;
 	users.users.root.initialPassword = "root";
  # programs.firefox.enable = true;
@@ -10,7 +10,7 @@
  disko.devices = {
    disk = {
      main = {
-        device = lib.mkDefault "nvme-CT1000P2SSD8_2221E632CD1F";
+        device = lib.mkDefault "/dev/disk/by-id/nvme-CT1000P2SSD8_2221E632CD1F";
        type = "disk";
        content = {
          type = "gpt";
@@ -33,6 +33,27 @@
        "type": "github"
      }
    },
+    "disko": {
+      "inputs": {
+        "nixpkgs": [
+          "nixpkgs"
+        ]
+      },
+      "locked": {
+        "lastModified": 1746728054,
+        "narHash": "sha256-eDoSOhxGEm2PykZFa/x9QG5eTH0MJdiJ9aR00VAofXE=",
+        "owner": "nix-community",
+        "repo": "disko",
+        "rev": "ff442f5d1425feb86344c028298548024f21256d",
+        "type": "github"
+      },
+      "original": {
+        "owner": "nix-community",
+        "ref": "latest",
+        "repo": "disko",
+        "type": "github"
+      }
+    },
    "flake-compat": {
      "flake": false,
      "locked": {
@@ -427,6 +448,7 @@
    },
    "root": {
      "inputs": {
+        "disko": "disko",
        "home-manager": "home-manager",
        "hyprland": "hyprland",
        "nixpkgs": "nixpkgs_2",
@@ -21,7 +21,7 @@
 			url = "github:nix-community/disko/latest";
 			inputs.nixpkgs.follows = "nixpkgs";
  	};
-
+};
  outputs =
    inputs@{ nixpkgs, home-manager, ... }:
    let
@@ -43,6 +43,9 @@
        # to pass through arguments to home.nix
      };
 			nixosConfigurations.nixos = nixpkgs.lib.nixosSystem {
+				specialArgs = {
+					inherit inputs system;
+				};
      	modules = [ ./configuration.nix inputs.sops-nix.nixosModules.sops inputs.disko.nixosModules.disko ];
    	};
    };
@@ -12,6 +12,11 @@
  home.username = "doloro";
  home.homeDirectory = "/home/doloro";
  
+  programs.git = {
+    enable = true;
+    userName = "doloro";
+    userEmail = "doloro@proton.me";
+  };
  # This value determines the Home Manager release that your configuration is
  # compatible with. This helps avoid breakage when a new Home Manager release
  # introduces backwards incompatible changes.
@@ -0,0 +1 @@
+age1e6vws55p0g23qzthm4qa93hpt6lqmck6670gkygph0sc0j7my4uq5wqjfh
@@ -13,4 +13,5 @@ in
            package = inputs.hyprland.packages.${pkgs.stdenv.hostPlatform.system}.hyprland;
            portalPackage = inputs.hyprland.packages.${pkgs.stdenv.hostPlatform.system}.xdg-desktop-portal-hyprland;
          };
+  programs.foot.enable = true;
 }
@@ -84,7 +84,7 @@
 		};
 		"$mainMod" = "SUPER";
 		binds = [			
-			"$mainMod, Q, exec, $terminal"
+			"$mainMod, Q, exec, foot"
 			"$mainMod, C, killactive,"
 			"$mainMod, M, exit,"
 			"$mainMod, E, exec, $fileManager"
@@ -0,0 +1,18 @@
+# WARNING: this file is generated from the nix.* options in
+# your NixOS configuration, typically
+# /etc/nixos/configuration.nix.  Do not edit it!
+allowed-users = *
+auto-optimise-store = false
+builders = 
+cores = 0
+max-jobs = auto
+require-sigs = true
+sandbox = true
+sandbox-fallback = false
+substituters = https://cache.nixos.org/
+system-features = nixos-test benchmark big-parallel kvm
+trusted-public-keys = cache.nixos.org-1:6NCHdD59X431o0gWypbMrAURkbJ16ZPMQFGspcDShjY=
+trusted-substituters = 
+trusted-users = root nixos
+extra-sandbox-paths = 
+
@@ -5,11 +5,20 @@ sops:
        - recipient: age1ykcy2r4kk729e7adqxu8s24ujc60z5eux7ma0ca4ruzydwgm5p6qmdp838
          enc: |
            -----BEGIN AGE ENCRYPTED FILE-----
-            YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBJYU8wczhvZXVscnJiK1Q3
-            WEdibmFLTHRjWmtoTXJmT1J1UFduaUJ6d2dvClZmNHZHYmpwZUR0MmVZeTBEZmxr
-            WE11TnlodmNqbEFwTUlPd1ZFc2tJTVkKLS0tIDZyMk5iZjFLWlpjOFZwTnNtcGpG
-            SUVwVjZ3MEhPRFJ0V25GYnNhL2ZSczQKHJbpKEyWBNnyBBXKHMz+WefSr/iMiCin
-            BftZDPEMaogAE+OIlSvTCDV5i8WMfPvt9laGI2pCNsPB/ke+WwXUUg==
+            YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBJektlZ3JVYmFqYS9Zd09Q
+            V1FVdTdVMjd2UUF5WHB5L2dOeXFlWml0cFNNCkduTVlwV0ZtTHg0cjV1N0hzeCto
+            Ym4xSVVERTdGcjRoUG5IcW42MmJTTm8KLS0tIHdXbkpzVFBzdUFQTjlDMVRBaG40
+            UFV6dUVUM0gzQmFoT21qK0crdENiK2cKeNBxr8ac9X7BOhNqnOrnoPsBPdf56WwH
+            zltXIxMVEZcEL6ggU7on/swIhEZAW0uJyhfQiVzI4M1XvLBu+PiTqg==
+            -----END AGE ENCRYPTED FILE-----
+        - recipient: age1e6vws55p0g23qzthm4qa93hpt6lqmck6670gkygph0sc0j7my4uq5wqjfh
+          enc: |
+            -----BEGIN AGE ENCRYPTED FILE-----
+            YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBLckMvUGtVUU9Jb1lIOUE3
+            UHdKZmVpcDBnSXZTTTB0ZER0VGRWUldmQkFNCkJTcVZEcjg4RXJlS08wcHpCZEoz
+            ZW9wU1JmVE5yeU5TVi8rTzFpOUNnUzQKLS0tIDI3OTdQZndkYWlycVhFY2RxNHhv
+            cDJzRjhUTzFmYVBUZ0NUSDV3MmZ1MWcKfSE7eQD0sh9Ag2S3TfYoUjH1772nGErX
+            P6GugohgWxQNXAptiyAzhAEys/2SHQ0lfI9tP2vfX0dQYPf1foGDDA==
            -----END AGE ENCRYPTED FILE-----
    lastmodified: "2025-09-21T15:03:11Z"
    mac: ENC[AES256_GCM,data:8z442Ny6iTUXR/daGASDfwf7KfiQbVdMor1xwSakmcVk5gFCI3fxRyJKOMDfYxdPuxHLarDowm2VYy0ismlduxaMs/7nK05Ry0issEeHlt1SGWiHqnfcjTvaiVhgh7k43nUIDnY7Vxe6cumBGhyW1xSKH4B6jUweaZyjn9V/ZCk=,iv:YpRnYD/FDhreWQUBmx7bEWWPFgofWbHKo7CIO0obuiM=,tag:zxOBTfEP4GxMV2DrhvKTNA==,type:str]
				`@@ -0,0 +1 @@`
				`age1e6vws55p0g23qzthm4qa93hpt6lqmck6670gkygph0sc0j7my4uq5wqjfh`