| author |  Fish <77413091+JulianBarbera@users.noreply.github.com> 2025-09-07 22:45:11-07:00 |
| committer | Fish <77413091+JulianBarbera@users.noreply.github.com> 2025-09-07 22:45:11-07:00 |
| log | 5f1d042056d5926ca5f1e98920a2148aacc7adce |
| tree | e7b6a8263e77fd1ec4e0211add03e784c770422e |
| parent | 852b4fdd53e8d4b18f02ccb1f72f66f1c4d4ee07 |
Updates for OS reinstall
3 files changed, 18 insertions(+), 40 deletions(-)
users
users/fish/cattop/configuration.nix-6
| ... | @@ -15,9 +15,6 @@ | ... | @@ -15,9 +15,6 @@ |
| 15 | networking.hostName = "cattop"; | 15 | networking.hostName = "cattop"; |
| 16 | # networking.networkmanager.enable = true; # Easiest to use and most distros use this by default. | 16 | # networking.networkmanager.enable = true; # Easiest to use and most distros use this by default. |
| 17 | 17 | ||
| 18 | # Set your time zone. | ||
| 19 | Time.timeZone = "America/Los_Angeles"; | ||
| 20 | |||
| 21 | services.xserver.enable = true; | 18 | services.xserver.enable = true; |
| 22 | 19 | ||
| 23 | services.displayManager.gdm.enable = true; | 20 | services.displayManager.gdm.enable = true; |
| ... | @@ -81,7 +78,6 @@ | ... | @@ -81,7 +78,6 @@ |
| 81 | 78 | ||
| 82 | users.users.fish = { | 79 | users.users.fish = { |
| 83 | isNormalUser = true; | 80 | isNormalUser = true; |
| 84 | shell = pkgs.fish; | ||
| 85 | extraGroups = [ | 81 | extraGroups = [ |
| 86 | "wheel" | 82 | "wheel" |
| 87 | "dialout" | 83 | "dialout" |
| ... | @@ -91,7 +87,6 @@ | ... | @@ -91,7 +87,6 @@ |
| 91 | git | 87 | git |
| 92 | nh | 88 | nh |
| 93 | vim | 89 | vim |
| 94 | fish | ||
| 95 | ]; | 90 | ]; |
| 96 | }; | 91 | }; |
| 97 | programs.git = { | 92 | programs.git = { |
| ... | @@ -113,7 +108,6 @@ | ... | @@ -113,7 +108,6 @@ |
| 113 | wget | 108 | wget |
| 114 | ]; | 109 | ]; |
| 115 | 110 | ||
| 116 | programs.fish.enable = true; | ||
| 117 | programs.mtr.enable = true; | 111 | programs.mtr.enable = true; |
| 118 | programs.gnupg.agent = { | 112 | programs.gnupg.agent = { |
| 119 | enable = true; | 113 | enable = true; |
users/fish/cattop/hardware-configuration.nix+17-31
| ... | @@ -1,46 +1,32 @@ | ... | @@ -1,46 +1,32 @@ |
| 1 | # Do not modify this file! It was generated by ‘nixos-generate-config’ | 1 | # Do not modify this file! It was generated by ‘nixos-generate-config’ |
| 2 | # and may be overwritten by future invocations. Please make changes | 2 | # and may be overwritten by future invocations. Please make changes |
| 3 | # to /etc/nixos/configuration.nix instead. | 3 | # to /etc/nixos/configuration.nix instead. |
| 4 | { | 4 | { config, lib, pkgs, modulesPath, ... }: |
| 5 | config, | ||
| 6 | lib, | ||
| 7 | pkgs, | ||
| 8 | modulesPath, | ||
| 9 | ... | ||
| 10 | }: | ||
| 11 | 5 | ||
| 12 | { | 6 | { |
| 13 | imports = [ | 7 | imports = |
| 14 | (modulesPath + "/installer/scan/not-detected.nix") | 8 | [ (modulesPath + "/installer/scan/not-detected.nix") |
| 15 | ]; | 9 | ]; |
| 16 | 10 | ||
| 17 | boot.initrd.availableKernelModules = [ | 11 | boot.initrd.availableKernelModules = [ "xhci_pci" "thunderbolt" "vmd" "nvme" ]; |
| 18 | "xhci_pci" | ||
| 19 | "thunderbolt" | ||
| 20 | "vmd" | ||
| 21 | "nvme" | ||
| 22 | ]; | ||
| 23 | boot.initrd.kernelModules = [ ]; | 12 | boot.initrd.kernelModules = [ ]; |
| 24 | boot.kernelModules = [ "kvm-intel" ]; | 13 | boot.kernelModules = [ "kvm-intel" ]; |
| 25 | boot.extraModulePackages = [ ]; | 14 | boot.extraModulePackages = [ ]; |
| 26 | 15 | ||
| 27 | fileSystems."/" = { | 16 | fileSystems."/" = |
| 28 | device = "/dev/disk/by-uuid/8eb0d6a2-b8cf-4ef2-ba2a-e25a5555b0bc"; | 17 | { device = "/dev/disk/by-uuid/d434c90f-e135-426e-b237-ead2f44e37c6"; |
| 29 | fsType = "ext4"; | 18 | fsType = "ext4"; |
| 30 | }; | 19 | }; |
| 31 | 20 | ||
| 32 | fileSystems."/boot/efi" = { | 21 | fileSystems."/boot/EFI" = |
| 33 | device = "/dev/disk/by-uuid/3B51-4A1C"; | 22 | { device = "/dev/disk/by-uuid/473A-B8FD"; |
| 34 | fsType = "vfat"; | 23 | fsType = "vfat"; |
| 35 | options = [ | 24 | options = [ "fmask=0077" "dmask=0077" ]; |
| 36 | "fmask=0077" | 25 | }; |
| 37 | "dmask=0077" | ||
| 38 | ]; | ||
| 39 | }; | ||
| 40 | 26 | ||
| 41 | swapDevices = [ | 27 | swapDevices = |
| 42 | { device = "/dev/disk/by-uuid/58ee9d19-292f-49b5-9979-341b42e8e09d"; } | 28 | [ { device = "/dev/disk/by-uuid/e0cac471-0e32-4d5a-bf85-e8f93b304356"; } |
| 43 | ]; | 29 | ]; |
| 44 | 30 | ||
| 45 | # Enables DHCP on each ethernet and wireless interface. In case of scripted networking | 31 | # Enables DHCP on each ethernet and wireless interface. In case of scripted networking |
| 46 | # (the default) this is the recommended approach. When using systemd-networkd it's | 32 | # (the default) this is the recommended approach. When using systemd-networkd it's |
users/fish/cattop/home.nix+1-3
| ... | @@ -8,12 +8,11 @@ | ... | @@ -8,12 +8,11 @@ |
| 8 | ghostty | 8 | ghostty |
| 9 | signal-desktop | 9 | signal-desktop |
| 10 | spotify | 10 | spotify |
| 11 | inputs.zen-browser.packages.x86_64-linux.default | ||
| 12 | legcord | 11 | legcord |
| 13 | 12 | ||
| 14 | # Gaming | 13 | # Gaming |
| 15 | (prismlauncher.override { gamemodeSupport = true; }) | 14 | (prismlauncher.override { gamemodeSupport = true; }) |
| 16 | bsdgames | 15 | #bsdgames |
| 17 | space-cadet-pinball | 16 | space-cadet-pinball |
| 18 | 17 | ||
| 19 | # System & desktop tools | 18 | # System & desktop tools |
| ... | @@ -41,7 +40,6 @@ | ... | @@ -41,7 +40,6 @@ |
| 41 | 40 | ||
| 42 | programs = { | 41 | programs = { |
| 43 | btop.enable = true; | 42 | btop.enable = true; |
| 44 | fish.enable = true; | ||
| 45 | hyfetch.enable = true; | 43 | hyfetch.enable = true; |
| 46 | 44 | ||
| 47 | gh = { | 45 | gh = { |