diff --git a/configuration.nix b/configuration.nix index 33433b6..c546c03 100644 --- a/configuration.nix +++ b/configuration.nix @@ -16,7 +16,7 @@ ]; imports = [ # Include the results of the hardware scan. - ./system/import_system.nix + ./system ./user/marty.nix ]; diff --git a/flake.nix b/flake.nix index 05cda12..34e797c 100644 --- a/flake.nix +++ b/flake.nix @@ -31,7 +31,7 @@ system = "x86_64-linux"; specialArgs = { inherit inputs; }; modules = [ - ./hosts/marty-pc.nix + ./hosts/marty-pc ./configuration.nix home-manager.nixosModules.home-manager ]; @@ -40,7 +40,7 @@ system = "x86_64-linux"; specialArgs = { inherit inputs; }; modules = [ - ./hosts/marty-server.nix + ./hosts/marty-server ./configuration.nix home-manager.nixosModules.home-manager @@ -50,7 +50,7 @@ system = "x86_64-linux"; specialArgs = { inherit inputs; }; modules = [ - ./hosts/marty-latitude.nix + ./hosts/marty-latitude ./configuration.nix home-manager.nixosModules.home-manager ]; diff --git a/hosts/marty-latitude/default.nix b/hosts/marty-latitude/default.nix new file mode 100644 index 0000000..372b8ba --- /dev/null +++ b/hosts/marty-latitude/default.nix @@ -0,0 +1,25 @@ +{ + config, + lib, + pkgs, + home-manager, + inputs, + ... +}: + +{ + networking = { + hostName = "marty-latitude"; + }; + + home-manager = { + extraSpecialArgs = { inherit inputs; }; + useGlobalPkgs = true; + useUserPackages = true; + users = { + marty = import ./home.nix; + }; + }; + + imports = [ ./hardware.nix ]; +} diff --git a/hosts/marty-latitude.nix b/hosts/marty-latitude/hardware.nix similarity index 81% rename from hosts/marty-latitude.nix rename to hosts/marty-latitude/hardware.nix index 488631f..67e6519 100644 --- a/hosts/marty-latitude.nix +++ b/hosts/marty-latitude/hardware.nix @@ -3,27 +3,10 @@ lib, pkgs, modulesPath, - home-manager, - inputs, ... }: { - networking = { - hostName = "marty-latitude"; - }; - - - home-manager = { - extraSpecialArgs = { inherit inputs; }; - useGlobalPkgs = true; - useUserPackages = true; - users = { - marty = import ./../modules/home.nix; - }; - }; - - # PREVIOUSLY HARDWARE-CONFIGURATION.NIX imports = [ (modulesPath + "/installer/scan/not-detected.nix") ]; diff --git a/modules/home.nix b/hosts/marty-latitude/home.nix similarity index 98% rename from modules/home.nix rename to hosts/marty-latitude/home.nix index e17d719..b19ffda 100644 --- a/modules/home.nix +++ b/hosts/marty-latitude/home.nix @@ -82,7 +82,6 @@ EDITOR = "codium"; }; - development = { vscodium.enable = true; git.enable = true; @@ -98,10 +97,8 @@ }; imports = [ - ./window_manager - ./development - ./terminal inputs.walker.homeManagerModules.default + ./../../modules ]; # Let Home Manager install and manage itself. diff --git a/hosts/marty-pc.nix b/hosts/marty-pc.nix deleted file mode 100644 index ad01246..0000000 --- a/hosts/marty-pc.nix +++ /dev/null @@ -1,87 +0,0 @@ -{ - config, - lib, - pkgs, - modulesPath, - home-manager, - inputs, - ... -}: - -{ - networking = { - hostName = "marty-pc"; - interfaces = { - enp42s0 = { - wakeOnLan = { - enable = true; - policy = [ "magic" ]; - }; - }; - }; - }; - - development = { - vscodium.enable = true; - git.enable = true; - }; - terminal = { - kitty.enable = true; - }; - window_manager = { - hyprland.enable = true; - waybar.enable = true; - walker.enable = true; - }; - - home-manager = { - extraSpecialArgs = { inherit inputs; }; - useGlobalPkgs = true; - useUserPackages = true; - users = { - marty = import ./../modules/home.nix; - }; - }; - - # PREVIOUSLY HARDWARE-CONFIGURATION.NIX - imports = [ - (modulesPath + "/installer/scan/not-detected.nix") - ]; - - boot.initrd.availableKernelModules = [ - "nvme" - "xhci_pci" - "ahci" - "usbhid" - "usb_storage" - "sd_mod" - ]; - boot.initrd.kernelModules = [ ]; - boot.kernelModules = [ "kvm-amd" ]; - boot.extraModulePackages = [ ]; - - fileSystems."/" = { - device = "/dev/disk/by-uuid/a26cdc8b-abc9-47cf-ad33-c81e56e56d22"; - fsType = "ext4"; - }; - - fileSystems."/boot" = { - device = "/dev/disk/by-uuid/C9B2-7254"; - fsType = "vfat"; - options = [ - "fmask=0077" - "dmask=0077" - ]; - }; - fileSystems = { - "/mnt/SSD" = { - device = "/dev/disk/by-uuid/af5282f0-0e02-4532-902f-97509af70d11"; - fsType = "ext4"; - }; - "/mnt/HDD" = { - device = "/dev/disk/by-uuid/41e7ec41-2e43-4254-9f00-f4be98cddc6e"; - fsType = "ext4"; - }; - }; - -} diff --git a/hosts/marty-pc/default.nix b/hosts/marty-pc/default.nix new file mode 100644 index 0000000..1547a09 --- /dev/null +++ b/hosts/marty-pc/default.nix @@ -0,0 +1,35 @@ +{ + config, + lib, + pkgs, + modulesPath, + home-manager, + inputs, + ... +}: + +{ + networking = { + hostName = "marty-pc"; + interfaces = { + enp42s0 = { + wakeOnLan = { + enable = true; + policy = [ "magic" ]; + }; + }; + }; + }; + + home-manager = { + extraSpecialArgs = { inherit inputs; }; + useGlobalPkgs = true; + useUserPackages = true; + users = { + marty = import ./home.nix; + }; + }; + + imports = [ ./hardware.nix ]; + +} diff --git a/hosts/marty-pc/hardware.nix b/hosts/marty-pc/hardware.nix new file mode 100644 index 0000000..2a29ea3 --- /dev/null +++ b/hosts/marty-pc/hardware.nix @@ -0,0 +1,53 @@ +{ + config, + lib, + pkgs, + modulesPath, + ... +}: + +{ + imports = [ + (modulesPath + "/installer/scan/not-detected.nix") + ]; + + boot.initrd.availableKernelModules = [ + "nvme" + "xhci_pci" + "ahci" + "usbhid" + "usb_storage" + "sd_mod" + ]; + boot.initrd.kernelModules = [ ]; + boot.kernelModules = [ "kvm-amd" ]; + boot.extraModulePackages = [ ]; + + fileSystems."/" = { + device = "/dev/disk/by-uuid/a26cdc8b-abc9-47cf-ad33-c81e56e56d22"; + fsType = "ext4"; + }; + + fileSystems."/boot" = { + device = "/dev/disk/by-uuid/C9B2-7254"; + fsType = "vfat"; + options = [ + "fmask=0077" + "dmask=0077" + ]; + }; + + swapDevices = [ + { device = "/dev/disk/by-uuid/24ecde92-b41b-4e41-8ebc-950d321db477"; } + ]; + + # 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 + # still possible to use this option, but it's recommended to use it in conjunction + # with explicit per-interface declarations with `networking.interfaces..useDHCP`. + networking.useDHCP = lib.mkDefault true; + # networking.interfaces.enp42s0.useDHCP = lib.mkDefault true; + + nixpkgs.hostPlatform = lib.mkDefault "x86_64-linux"; + hardware.cpu.amd.updateMicrocode = lib.mkDefault config.hardware.enableRedistributableFirmware; +} diff --git a/hosts/marty-pc/home.nix b/hosts/marty-pc/home.nix new file mode 100644 index 0000000..1e0b336 --- /dev/null +++ b/hosts/marty-pc/home.nix @@ -0,0 +1,105 @@ +{ + config, + pkgs, + inputs, + lib, + ... +}: + +{ + # Home Manager needs a bit of information about you and the paths it should + # manage. + home.username = "marty"; + home.homeDirectory = "/home/marty"; + + # 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. + # + # You should not change this value, even if you update Home Manager. If you do + # want to update the value, then make sure to first check the Home Manager + # release notes. + home.stateVersion = "25.11"; # Please read the comment before changing. + + # The home.packages option allows you to install Nix packages into your + # environment. + + programs.fish.enable = true; + + home.packages = with pkgs; [ + # # Adds the 'hello' command to your environment. It prints a friendly + # # "Hello, world!" when run. + hello + rbw + pinentry-curses + + # # It is sometimes useful to fine-tune packages, for example, by applying + # # overrides. You can do that directly here, just don't forget the + # # parentheses. Maybe you want to install Nerd Fonts with a limited number of + # # fonts? + # (pkgs.nerdfonts.override { fonts = [ "FantasqueSansMono" ]; }) + + # # You can also create simple shell scripts directly inside your + # # configuration. For example, this adds a command 'my-hello' to your + # # environment: + # (pkgs.writeShellScriptBin "my-hello" '' + # echo "Hello, ${config.home.username}!" + # '') + ]; + + # Home Manager is pretty good at managing dotfiles. The primary way to manage + # plain files is through 'home.file'. + home.file = { + # # Building this configuration will create a copy of 'dotfiles/screenrc' in + # # the Nix store. Activating the configuration will then make '~/.screenrc' a + # # symlink to the Nix store copy. + # ".screenrc".source = dotfiles/screenrc; + + # # You can also set the file content immediately. + # ".gradle/gradle.properties".text = '' + # org.gradle.console=verbose + # org.gradle.daemon.idletimeout=3600000 + # ''; + }; + + # Home Manager can also manage your environment variables through + # 'home.sessionVariables'. These will be explicitly sourced when using a + # shell provided by Home Manager. If you don't want to manage your shell + # through Home Manager then you have to manually source 'hm-session-vars.sh' + # located at either + # + # ~/.nix-profile/etc/profile.d/hm-session-vars.sh + # + # or + # + # ~/.local/state/nix/profiles/profile/etc/profile.d/hm-session-vars.sh + # + # or + # + # /etc/profiles/per-user/marty/etc/profile.d/hm-session-vars.sh + # + home.sessionVariables = { + EDITOR = "codium"; + }; + + development = { + vscodium.enable = true; + git.enable = true; + }; + terminal = { + kitty.enable = true; + }; + window_manager = { + hyprland.enable = true; + waybar.enable = true; + walker.enable = true; + }; + + imports = [ + inputs.walker.homeManagerModules.default + ./../../modules + + ]; + # Let Home Manager install and manage itself. + programs.home-manager.enable = true; +} diff --git a/hosts/marty-server.nix b/hosts/marty-server.nix deleted file mode 100644 index aae0053..0000000 --- a/hosts/marty-server.nix +++ /dev/null @@ -1,83 +0,0 @@ -{ - config, - lib, - pkgs, - modulesPath, - home-manager, - inputs, - ... -}: - -{ - networking = { - hostName = "marty-server"; - interfaces = { - eno1 = { - wakeOnLan = { - enable = true; - policy = [ "magic" ]; - }; - }; - }; - }; - - development = { - vscodium.enable = false; - git.enable = true; - }; - terminal = { - kitty.enable = false; - }; - window_manager = { - hyprland.enable = false; - waybar.enable = false; - walker.enable = false; - }; - - home-manager = { - extraSpecialArgs = { inherit inputs; }; - useGlobalPkgs = true; - useUserPackages = true; - users = { - marty = import ./../modules/home.nix; - }; - }; - - # PREVIOUSLY HARDWARE-CONFIGURATION.NIX - imports = [ - (modulesPath + "/installer/scan/not-detected.nix") - ]; - - boot.initrd.availableKernelModules = [ - "xhci_pci" - "ahci" - "nvme" - "usbhid" - "usb_storage" - "sd_mod" - ]; - boot.initrd.kernelModules = [ ]; - boot.kernelModules = [ ]; - boot.extraModulePackages = [ ]; - - fileSystems."/" = { - device = "/dev/disk/by-uuid/a804bdf0-194c-4fe4-a451-64620d3d293d"; - fsType = "ext4"; - }; - - fileSystems."/boot" = { - device = "/dev/disk/by-uuid/44A5-B01F"; - fsType = "vfat"; - options = [ - "fmask=0077" - "dmask=0077" - ]; - }; - - fileSystems = { - "/mnt/Data" = { - device = "/dev/disk/by-uuid/20eaea9c-6924-40c6-a784-cd5018d8fabb"; - fsType = "ext4"; - }; - }; -} diff --git a/hosts/marty-server/default.nix b/hosts/marty-server/default.nix new file mode 100644 index 0000000..76767e0 --- /dev/null +++ b/hosts/marty-server/default.nix @@ -0,0 +1,33 @@ +{ + config, + lib, + pkgs, + modulesPath, + home-manager, + inputs, + ... +}: + +{ + networking = { + hostName = "marty-server"; + interfaces = { + eno1 = { + wakeOnLan = { + enable = true; + policy = [ "magic" ]; + }; + }; + }; + }; + + home-manager = { + extraSpecialArgs = { inherit inputs; }; + useGlobalPkgs = true; + useUserPackages = true; + users = { + marty = import ./home.nix; + }; + }; + imports = [ ./hardware.nix ]; +} diff --git a/hosts/marty-server/hardware.nix b/hosts/marty-server/hardware.nix new file mode 100644 index 0000000..793c829 --- /dev/null +++ b/hosts/marty-server/hardware.nix @@ -0,0 +1,53 @@ +{ + config, + lib, + pkgs, + modulesPath, + ... +}: + +{ + imports = [ + (modulesPath + "/installer/scan/not-detected.nix") + ]; + + boot.initrd.availableKernelModules = [ + "xhci_pci" + "ahci" + "nvme" + "usbhid" + "usb_storage" + "sd_mod" + ]; + boot.initrd.kernelModules = [ ]; + boot.kernelModules = [ ]; + boot.extraModulePackages = [ ]; + + fileSystems."/" = { + device = "/dev/disk/by-uuid/a804bdf0-194c-4fe4-a451-64620d3d293d"; + fsType = "ext4"; + }; + + fileSystems."/boot" = { + device = "/dev/disk/by-uuid/44A5-B01F"; + fsType = "vfat"; + options = [ + "fmask=0077" + "dmask=0077" + ]; + }; + + swapDevices = [ + { device = "/dev/disk/by-uuid/1c087bce-8d50-4bb7-b84a-418e3fb7d359"; } + ]; + + # 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 + # still possible to use this option, but it's recommended to use it in conjunction + # with explicit per-interface declarations with `networking.interfaces..useDHCP`. + networking.useDHCP = lib.mkDefault true; + # networking.interfaces.eno1.useDHCP = lib.mkDefault true; + + nixpkgs.hostPlatform = lib.mkDefault "x86_64-linux"; + hardware.cpu.intel.updateMicrocode = lib.mkDefault config.hardware.enableRedistributableFirmware; +} diff --git a/hosts/marty-server/home.nix b/hosts/marty-server/home.nix new file mode 100644 index 0000000..3c9a1a2 --- /dev/null +++ b/hosts/marty-server/home.nix @@ -0,0 +1,105 @@ +{ + config, + pkgs, + inputs, + lib, + ... +}: + +{ + # Home Manager needs a bit of information about you and the paths it should + # manage. + home.username = "marty"; + home.homeDirectory = "/home/marty"; + + # 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. + # + # You should not change this value, even if you update Home Manager. If you do + # want to update the value, then make sure to first check the Home Manager + # release notes. + home.stateVersion = "25.11"; # Please read the comment before changing. + + # The home.packages option allows you to install Nix packages into your + # environment. + + programs.fish.enable = true; + + home.packages = with pkgs; [ + # # Adds the 'hello' command to your environment. It prints a friendly + # # "Hello, world!" when run. + hello + rbw + pinentry-curses + + # # It is sometimes useful to fine-tune packages, for example, by applying + # # overrides. You can do that directly here, just don't forget the + # # parentheses. Maybe you want to install Nerd Fonts with a limited number of + # # fonts? + # (pkgs.nerdfonts.override { fonts = [ "FantasqueSansMono" ]; }) + + # # You can also create simple shell scripts directly inside your + # # configuration. For example, this adds a command 'my-hello' to your + # # environment: + # (pkgs.writeShellScriptBin "my-hello" '' + # echo "Hello, ${config.home.username}!" + # '') + ]; + + # Home Manager is pretty good at managing dotfiles. The primary way to manage + # plain files is through 'home.file'. + home.file = { + # # Building this configuration will create a copy of 'dotfiles/screenrc' in + # # the Nix store. Activating the configuration will then make '~/.screenrc' a + # # symlink to the Nix store copy. + # ".screenrc".source = dotfiles/screenrc; + + # # You can also set the file content immediately. + # ".gradle/gradle.properties".text = '' + # org.gradle.console=verbose + # org.gradle.daemon.idletimeout=3600000 + # ''; + }; + + # Home Manager can also manage your environment variables through + # 'home.sessionVariables'. These will be explicitly sourced when using a + # shell provided by Home Manager. If you don't want to manage your shell + # through Home Manager then you have to manually source 'hm-session-vars.sh' + # located at either + # + # ~/.nix-profile/etc/profile.d/hm-session-vars.sh + # + # or + # + # ~/.local/state/nix/profiles/profile/etc/profile.d/hm-session-vars.sh + # + # or + # + # /etc/profiles/per-user/marty/etc/profile.d/hm-session-vars.sh + # + home.sessionVariables = { + EDITOR = "codium"; + }; + + development = { + vscodium.enable = false; + git.enable = true; + }; + terminal = { + kitty.enable = false; + }; + window_manager = { + hyprland.enable = false; + waybar.enable = false; + walker.enable = false; + }; + + imports = [ + inputs.walker.homeManagerModules.default + ./../../modules + + ]; + # Let Home Manager install and manage itself. + programs.home-manager.enable = true; +} diff --git a/modules/default.nix b/modules/default.nix new file mode 100644 index 0000000..5105377 --- /dev/null +++ b/modules/default.nix @@ -0,0 +1,14 @@ +{ + config, + lib, + pkgs, + ... +}: + +{ + imports = [ + ./development + ./terminal + ./window_manager + ]; +} diff --git a/modules/terminal/default.nix b/modules/terminal/default.nix index 215dca1..ea8b2e8 100644 --- a/modules/terminal/default.nix +++ b/modules/terminal/default.nix @@ -9,6 +9,7 @@ imports = [ ./kitty.nix ./ranger.nix + ./fish.nix ]; } diff --git a/modules/terminal/fish.nix b/modules/terminal/fish.nix new file mode 100644 index 0000000..162ff67 --- /dev/null +++ b/modules/terminal/fish.nix @@ -0,0 +1,22 @@ +{ + config, + lib, + pkgs, + ... +}: + +{ + options = { + terminal = { + fish.enable = lib.mkEnableOption "enable fish"; + }; + }; + + config = lib.mkIf config.terminal.fish.enable { + programs = { + fish = { + enable = true; + }; + }; + }; +} diff --git a/system/import_system.nix b/system/default.nix similarity index 100% rename from system/import_system.nix rename to system/default.nix diff --git a/system/dm.nix b/system/dm.nix index 944bf6c..5390aad 100644 --- a/system/dm.nix +++ b/system/dm.nix @@ -1,18 +1,22 @@ -{ config, pkgs, lib, ...}: +{ + config, + pkgs, + lib, + ... +}: { services = { xserver = { xkb = { -layout = "de"; -variant = ""; -}; -}; -displayManager.gdm = { -enable = true; -wayland = true; -autoSuspend = false; -}; -}; + layout = "de"; + variant = ""; + }; + }; + displayManager.gdm = { + enable = true; + wayland = true; + autoSuspend = false; + }; + }; } - diff --git a/system/networking.nix b/system/networking.nix index de9f756..adb96ce 100644 --- a/system/networking.nix +++ b/system/networking.nix @@ -21,11 +21,3 @@ }; }; } - - - - - - - - diff --git a/system/shell.nix b/system/shell.nix index 968d8fa..a59c56c 100644 --- a/system/shell.nix +++ b/system/shell.nix @@ -3,13 +3,8 @@ { environment = { systemPackages = with pkgs; [ - fish coreutils ]; }; - # programs = { - # fish = { - # enable = true; - # }; - # }; + programs.fish.enable = true; } diff --git a/user/marty.nix b/user/marty.nix index 2a7b6c2..0cdb836 100644 --- a/user/marty.nix +++ b/user/marty.nix @@ -16,7 +16,7 @@ "audio" "render" ]; - # shell = pkgs.fish; + shell = pkgs.fish; }; security.sudo = {