| author |  Natalie Marks <nmarks413@gmail.com> 2025-07-05 20:35:03-07:00 |
| committer | Natalie Marks <nmarks413@gmail.com> 2025-07-05 20:35:03-07:00 |
| log | e6df94da34173479bbe43e8a3035538c0493d396 |
| tree | 0061054bc9b59f75c286ec0bf11413139a0fa642 |
| parent | db93fc5149f66cced9e045cdc2be8ca4926fecc9 |
| parent | b808a79ab266c85d48e757406b89d06b29f51f03 |
| signature | Commit is signed but in an unrecognized format. |
Merge branch 'main' of paperclover.dev:nix/config
5 files changed, 43 insertions(+), 31 deletions(-)
flake.nix-3
| ... | @@ -150,9 +150,6 @@ | ... | @@ -150,9 +150,6 @@ |
| 150 | user = "julia"; | 150 | user = "julia"; |
| 151 | host = "cattop"; | 151 | host = "cattop"; |
| 152 | system = "x86_64-linux"; | 152 | system = "x86_64-linux"; |
| 153 | extraModules = [ | ||
| 154 | nixos-cosmic.nixosModules.default | ||
| 155 | ]; | ||
| 156 | }; | 153 | }; |
| 157 | 154 | ||
| 158 | # generate checks for "nix flake check --all-systems --no-build" | 155 | # generate checks for "nix flake check --all-systems --no-build" |
modules/nixos/services.nix-4
| ... | @@ -22,10 +22,6 @@ | ... | @@ -22,10 +22,6 @@ |
| 22 | }; | 22 | }; |
| 23 | }; | 23 | }; |
| 24 | 24 | ||
| 25 | desktopManager.cosmic.enable = true; | ||
| 26 | displayManager.cosmic-greeter.enable = true; | ||
| 27 | desktopManager.cosmic.xwayland.enable = true; | ||
| 28 | |||
| 29 | # Auto mount devices | 25 | # Auto mount devices |
| 30 | udisks2 = { | 26 | udisks2 = { |
| 31 | enable = true; | 27 | enable = true; |
switch+7-7
| ... | @@ -1,12 +1,12 @@ | ... | @@ -1,12 +1,12 @@ |
| 1 | #!/bin/sh | 1 | #!/bin/sh |
| 2 | nh_subcommand="os" | 2 | nh_subcommand="os" |
| 3 | fallback_command="nixos-rebuild" | 3 | fallback_command="nixos-rebuild" |
| 4 | if [ "$(uname -o)" ]; then | 4 | if [ "$(uname -o)" = "darwin" ]; then |
| 5 | nh_subcommand="darwin" | 5 | nh_subcommand="darwin" |
| 6 | fallback_command="nix run .#darwin-rebuild" | 6 | fallback_command="nix run .#darwin-rebuild" |
| 7 | fi; | 7 | fi |
| 8 | if command -v nh > /dev/null; then | 8 | if command -v nh >/dev/null; then |
| 9 | nh $nh_subcommand switch . | 9 | nh $nh_subcommand switch . |
| 10 | else | 10 | else |
| 11 | $fallback_command -- switch --flake . | 11 | $fallback_command -- switch --flake . |
| 12 | fi | 12 | fi |
users/julia/cattop/hardware-configuration.nix+31-17
| ... | @@ -1,32 +1,46 @@ | ... | @@ -1,32 +1,46 @@ |
| 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 | { config, lib, pkgs, modulesPath, ... }: | 4 | { |
| 5 | config, | ||
| 6 | lib, | ||
| 7 | pkgs, | ||
| 8 | modulesPath, | ||
| 9 | ... | ||
| 10 | }: | ||
| 5 | 11 | ||
| 6 | { | 12 | { |
| 7 | imports = | 13 | imports = [ |
| 8 | [ (modulesPath + "/installer/scan/not-detected.nix") | 14 | (modulesPath + "/installer/scan/not-detected.nix") |
| 9 | ]; | 15 | ]; |
| 10 | 16 | ||
| 11 | boot.initrd.availableKernelModules = [ "xhci_pci" "thunderbolt" "vmd" "nvme" ]; | 17 | boot.initrd.availableKernelModules = [ |
| 18 | "xhci_pci" | ||
| 19 | "thunderbolt" | ||
| 20 | "vmd" | ||
| 21 | "nvme" | ||
| 22 | ]; | ||
| 12 | boot.initrd.kernelModules = [ ]; | 23 | boot.initrd.kernelModules = [ ]; |
| 13 | boot.kernelModules = [ "kvm-intel" ]; | 24 | boot.kernelModules = [ "kvm-intel" ]; |
| 14 | boot.extraModulePackages = [ ]; | 25 | boot.extraModulePackages = [ ]; |
| 15 | 26 | ||
| 16 | fileSystems."/" = | 27 | fileSystems."/" = { |
| 17 | { device = "/dev/disk/by-uuid/8eb0d6a2-b8cf-4ef2-ba2a-e25a5555b0bc"; | 28 | device = "/dev/disk/by-uuid/8eb0d6a2-b8cf-4ef2-ba2a-e25a5555b0bc"; |
| 18 | fsType = "ext4"; | 29 | fsType = "ext4"; |
| 19 | }; | 30 | }; |
| 20 | 31 | ||
| 21 | fileSystems."/boot" = | 32 | fileSystems."/boot/efi" = { |
| 22 | { device = "/dev/disk/by-uuid/3B51-4A1C"; | 33 | device = "/dev/disk/by-uuid/3B51-4A1C"; |
| 23 | fsType = "vfat"; | 34 | fsType = "vfat"; |
| 24 | options = [ "fmask=0077" "dmask=0077" ]; | 35 | options = [ |
| 25 | }; | 36 | "fmask=0077" |
| 26 | 37 | "dmask=0077" | |
| 27 | swapDevices = | ||
| 28 | [ { device = "/dev/disk/by-uuid/58ee9d19-292f-49b5-9979-341b42e8e09d"; } | ||
| 29 | ]; | 38 | ]; |
| 39 | }; | ||
| 40 | |||
| 41 | swapDevices = [ | ||
| 42 | { device = "/dev/disk/by-uuid/58ee9d19-292f-49b5-9979-341b42e8e09d"; } | ||
| 43 | ]; | ||
| 30 | 44 | ||
| 31 | # Enables DHCP on each ethernet and wireless interface. In case of scripted networking | 45 | # Enables DHCP on each ethernet and wireless interface. In case of scripted networking |
| 32 | # (the default) this is the recommended approach. When using systemd-networkd it's | 46 | # (the default) this is the recommended approach. When using systemd-networkd it's |
users/natalie/desktop/configuration.nix+5
| ... | @@ -121,6 +121,11 @@ | ... | @@ -121,6 +121,11 @@ |
| 121 | 121 | ||
| 122 | # Enable sound with pipewire. | 122 | # Enable sound with pipewire. |
| 123 | security.rtkit.enable = true; | 123 | security.rtkit.enable = true; |
| 124 | services = { | ||
| 125 | desktopManager.cosmic.enable = true; | ||
| 126 | displayManager.cosmic-greeter.enable = true; | ||
| 127 | desktopManager.cosmic.xwayland.enable = true; | ||
| 128 | }; | ||
| 124 | 129 | ||
| 125 | # Enable touchpad support (enabled default in most desktopManager). | 130 | # Enable touchpad support (enabled default in most desktopManager). |
| 126 | # services.xserver.libinput.enable = true; | 131 | # services.xserver.libinput.enable = true; |