diff options
| -rw-r--r-- | modules/features/niri.nix | 10 | ||||
| -rw-r--r-- | modules/features/noctalia.nix | 8 | ||||
| -rw-r--r-- | modules/hosts/herra/configuration.nix | 19 | ||||
| -rw-r--r-- | modules/hosts/herra/default.nix | 11 | ||||
| -rw-r--r-- | modules/hosts/herra/hardware.nix | 54 | ||||
| -rw-r--r-- | modules/system/keyboard.nix | 12 | ||||
| -rw-r--r-- | modules/system/system.nix | 1 |
7 files changed, 105 insertions, 10 deletions
diff --git a/modules/features/niri.nix b/modules/features/niri.nix index 312ba10..435a390 100644 --- a/modules/features/niri.nix +++ b/modules/features/niri.nix @@ -20,23 +20,21 @@ self', ... }: { - packages.myNiri = inputs.wrapper-modules.wrappers.niri.wrap { + packages.ngeNiri = inputs.wrapper-modules.wrappers.niri.wrap { inherit pkgs; settings = { spawn-at-startup = [ - (lib.getExe self'.packages.myNoctalia) + (lib.getExe self'.packages.ngeNoctalia) ]; xwayland-satellite.path = lib.getExe pkgs.xwayland-satellite; - input.keyboard.xkb.layout = "cz-qwertz"; - layout.gaps = 5; binds = { "Mod+Return".spawn-sh = lib.getExe pkgs.alacritty; - "Mod+Shift+Q".close-window = null; - "Mod+S".spawn-sh = "${lib.getExe self'.packages.myNoctalia} ipc call launcher toggle"; + "Mod+Shift+Q".close-window = {}; + "Mod+S".spawn-sh = "${lib.getExe self'.packages.ngeNoctalia} ipc call launcher toggle"; }; }; }; diff --git a/modules/features/noctalia.nix b/modules/features/noctalia.nix index 7b4cd7d..42f489a 100644 --- a/modules/features/noctalia.nix +++ b/modules/features/noctalia.nix @@ -4,11 +4,11 @@ ... }: { perSystem = {pkgs, ...}: { - packages.myNoctalia = inputs.wrapper-modules.wrappers.noctalia-shell.wrap { + packages.ngeNoctalia = inputs.wrapper-modules.wrappers.noctalia-shell.wrap { inherit pkgs; - settings = - (builtins.fromJSON - (builtins.readFile ./noctalia.json)).settings; + # settings = + # (builtins.fromJSON + # (builtins.readFile ./noctalia.json)).settings; }; }; } diff --git a/modules/hosts/herra/configuration.nix b/modules/hosts/herra/configuration.nix new file mode 100644 index 0000000..95e852d --- /dev/null +++ b/modules/hosts/herra/configuration.nix @@ -0,0 +1,19 @@ +{ + self, + inputs, + ... +}: { + flake.nixosModules.herraConfiguration = { + pkgs, + lib, + ... + }: { + imports = [ + self.nixosModules.herraHardware + self.nixosModules.system + self.nixosModules.niri + ]; + + # ... + }; +} diff --git a/modules/hosts/herra/default.nix b/modules/hosts/herra/default.nix new file mode 100644 index 0000000..4e9c74e --- /dev/null +++ b/modules/hosts/herra/default.nix @@ -0,0 +1,11 @@ +{ + self, + inputs, + ... +}: { + flake.nixosConfigurations.herra = inputs.nixpkgs.lib.nixosSystem { + modules = [ + self.nixosModules.herraConfiguration + ]; + }; +} diff --git a/modules/hosts/herra/hardware.nix b/modules/hosts/herra/hardware.nix new file mode 100644 index 0000000..2ec7efb --- /dev/null +++ b/modules/hosts/herra/hardware.nix @@ -0,0 +1,54 @@ +{ + self, + inputs, + ... +}: { + flake.nixosModules.herraHardware = { + config, + lib, + pkgs, + modulesPath, + ... + }: { + # Do not modify this file! It was generated by ‘nixos-generate-config’ + # and may be overwritten by future invocations. Please make changes + # to /etc/nixos/configuration.nix instead. + + imports = [ + (modulesPath + "/installer/scan/not-detected.nix") + ]; + + boot.initrd.availableKernelModules = ["xhci_pci" "ahci" "nvme" "thunderbolt" "usbhid" "usb_storage" "sd_mod"]; + boot.initrd.kernelModules = []; + boot.kernelModules = ["kvm-intel"]; + boot.extraModulePackages = []; + + fileSystems."/" = { + device = "/dev/disk/by-uuid/229a13d8-159e-40b6-915a-606c32e3ca79"; + fsType = "btrfs"; + options = ["subvol=@"]; + }; + + fileSystems."/home" = { + device = "/dev/disk/by-uuid/229a13d8-159e-40b6-915a-606c32e3ca79"; + fsType = "btrfs"; + options = ["subvol=@home"]; + }; + + fileSystems."/boot" = { + device = "/dev/disk/by-uuid/03F6-F782"; + fsType = "vfat"; + options = ["fmask=0077" "dmask=0077"]; + }; + + fileSystems."/nix" = { + device = "/dev/disk/by-uuid/28fb6b6d-fb64-4a42-80af-88ce7b081258"; + fsType = "btrfs"; + }; + + swapDevices = []; + + nixpkgs.hostPlatform = lib.mkDefault "x86_64-linux"; + hardware.cpu.intel.updateMicrocode = lib.mkDefault config.hardware.enableRedistributableFirmware; + }; +} diff --git a/modules/system/keyboard.nix b/modules/system/keyboard.nix new file mode 100644 index 0000000..1333637 --- /dev/null +++ b/modules/system/keyboard.nix @@ -0,0 +1,12 @@ +{ + self, + lib, + ... +}: { + flake.nixosModule.keyboard = {...}: { + xkb = { + layout = lib.mkDefauklt "cz"; + options = lib.mkDefault "eurosign:e,caps:escape"; + }; + }; +} diff --git a/modules/system/system.nix b/modules/system/system.nix index 08259e7..2ad6188 100644 --- a/modules/system/system.nix +++ b/modules/system/system.nix @@ -11,6 +11,7 @@ }: { imports = [ self.nixosModules.nix # Nix configuration + self.nixosModules.keyboard # Keyboard layout configuration & similiar self.nixosModules.keys # Configuration for encrypted drive on my keys ]; }; |