From 4416771203e92848d14dd114b5d4cfe32f773d50 Mon Sep 17 00:00:00 2001 From: Daniel Bulant Date: Tue, 7 Apr 2026 22:31:10 +0200 Subject: [PATCH] refactor config, update --- flake.lock | 156 +++++++++--------- flake.nix | 24 ++- .../aura/hardware-configuration.nix | 0 servers/fern/configuration.nix | 54 ++++++ servers/fern/hardware-configuration.nix | 42 +++++ .../ui-mode/configuration.nix | 26 +-- home.nix => servers/ui-mode/home.nix | 2 +- with-extra.sh | 1 + 8 files changed, 211 insertions(+), 94 deletions(-) rename hardware-configuration.nix => servers/aura/hardware-configuration.nix (100%) create mode 100644 servers/fern/configuration.nix create mode 100644 servers/fern/hardware-configuration.nix rename configuration.nix => servers/ui-mode/configuration.nix (97%) rename home.nix => servers/ui-mode/home.nix (99%) create mode 100644 with-extra.sh diff --git a/flake.lock b/flake.lock index 82861e2..f469a97 100644 --- a/flake.lock +++ b/flake.lock @@ -91,11 +91,11 @@ "nixpkgs": "nixpkgs_5" }, "locked": { - "lastModified": 1774983731, - "narHash": "sha256-ZJGManY8rA/7+AZIxiW0CEMW9x8megcoh1xZ/oXq/aY=", + "lastModified": 1775334496, + "narHash": "sha256-dUopEMj5KhH1vnv43o29kMsayp0Ki+9EfIn4UAE9sAU=", "owner": "9001", "repo": "copyparty", - "rev": "198f631ac80adc33a8f072d598ff0cd1aa2b5abd", + "rev": "ede692925edfc6fca7a52f483414d543e9303237", "type": "github" }, "original": { @@ -111,11 +111,11 @@ ] }, "locked": { - "lastModified": 1774118214, - "narHash": "sha256-Y7frUOBhSJtalBo/kDESkTTvsQe1FJov5EUzKF+sfjM=", + "lastModified": 1775400666, + "narHash": "sha256-R0Eh0KeaclBb5tIs8hQg6+DjqENn7SBlZkJKZCt3NYg=", "owner": "AvengeMedia", "repo": "danksearch", - "rev": "1342ceae4c0a18b45cce7a00dd26fe924a42d66a", + "rev": "53663c86805edd79c9c17fa0adf14f54b8edfc24", "type": "github" }, "original": { @@ -133,12 +133,12 @@ "nixpkgs": "nixpkgs_7" }, "locked": { - "lastModified": 1774669632, - "narHash": "sha256-OHRHymsM6sX0B7Xjpvf3m49vTgKzJGukJhw/O1O5bj4=", - "rev": "2edae0b5150c83c07cf7b7e86e937ad956d78197", - "revCount": 410, + "lastModified": 1775584659, + "narHash": "sha256-NA5oZRunqxD+4LNdU7ZKJHqwuazKyAmBjO4OHXL14X4=", + "rev": "21dcaa011d3d35cf42a04e988eaac9b28c97a707", + "revCount": 411, "type": "tarball", - "url": "https://api.flakehub.com/f/pinned/DeterminateSystems/determinate/3.17.2/019d3290-fc2e-714a-bf96-59b71ef2dcb1/source.tar.gz" + "url": "https://api.flakehub.com/f/pinned/DeterminateSystems/determinate/3.17.3/019d691b-0a67-74d9-90e1-1a3c86286399/source.tar.gz" }, "original": { "type": "tarball", @@ -148,37 +148,37 @@ "determinate-nixd-aarch64-darwin": { "flake": false, "locked": { - "narHash": "sha256-T5PoERn2FTupvCwGmQhbYO/oQ0w+51nRn+0QRbnA9tg=", + "narHash": "sha256-qLWfYk9qkb21wKCDWnhMfqBFjcdBBJkNUKBlvdHSLgA=", "type": "file", - "url": "https://install.determinate.systems/determinate-nixd/tag/v3.17.2/macOS" + "url": "https://install.determinate.systems/determinate-nixd/tag/v3.17.3/macOS" }, "original": { "type": "file", - "url": "https://install.determinate.systems/determinate-nixd/tag/v3.17.2/macOS" + "url": "https://install.determinate.systems/determinate-nixd/tag/v3.17.3/macOS" } }, "determinate-nixd-aarch64-linux": { "flake": false, "locked": { - "narHash": "sha256-T0iRt3f+2Q+KUU1VzdGiG6GluViuxuKr+bMG5eVtPO0=", + "narHash": "sha256-0BmprPIRTopvJ2QdImOMP+TujAPVgRdl0bUL3vhqGIY=", "type": "file", - "url": "https://install.determinate.systems/determinate-nixd/tag/v3.17.2/aarch64-linux" + "url": "https://install.determinate.systems/determinate-nixd/tag/v3.17.3/aarch64-linux" }, "original": { "type": "file", - "url": "https://install.determinate.systems/determinate-nixd/tag/v3.17.2/aarch64-linux" + "url": "https://install.determinate.systems/determinate-nixd/tag/v3.17.3/aarch64-linux" } }, "determinate-nixd-x86_64-linux": { "flake": false, "locked": { - "narHash": "sha256-FDeJY4hugYM0+vB2rvKY8WpYgPNH7kNS0M082Rnk/CI=", + "narHash": "sha256-+Q85cySxr0FB/cr97hk/WWYgeJY+iC4OH+FjGYygIbU=", "type": "file", - "url": "https://install.determinate.systems/determinate-nixd/tag/v3.17.2/x86_64-linux" + "url": "https://install.determinate.systems/determinate-nixd/tag/v3.17.3/x86_64-linux" }, "original": { "type": "file", - "url": "https://install.determinate.systems/determinate-nixd/tag/v3.17.2/x86_64-linux" + "url": "https://install.determinate.systems/determinate-nixd/tag/v3.17.3/x86_64-linux" } }, "dms": { @@ -189,11 +189,11 @@ "quickshell": "quickshell" }, "locked": { - "lastModified": 1774363468, - "narHash": "sha256-N1fBzyzTIxTx1loBxPbUj5gIwM3Znb6ec4lSGmnjWk4=", + "lastModified": 1775588644, + "narHash": "sha256-iYBdSBvcW7bJtc84G6k5TFJEbPHQrif9KzZyE9Lbq8M=", "owner": "AvengeMedia", "repo": "DankMaterialShell", - "rev": "6921442aabf4a7d0901d495459f6deaaf3d0d656", + "rev": "9798d78300d402178896f6ee1c370baed490158a", "type": "github" }, "original": { @@ -377,11 +377,11 @@ "nixpkgs-lib": "nixpkgs-lib_2" }, "locked": { - "lastModified": 1772408722, - "narHash": "sha256-rHuJtdcOjK7rAHpHphUb1iCvgkU3GpfvicLMwwnfMT0=", + "lastModified": 1775087534, + "narHash": "sha256-91qqW8lhL7TLwgQWijoGBbiD4t7/q75KTi8NxjVmSmA=", "owner": "hercules-ci", "repo": "flake-parts", - "rev": "f20dc5d9b8027381c474144ecabc9034d6a839a3", + "rev": "3107b77cd68437b9a76194f0f7f9c55f2329ca5b", "type": "github" }, "original": { @@ -494,11 +494,11 @@ ] }, "locked": { - "lastModified": 1774104215, - "narHash": "sha256-EAtviqz0sEAxdHS4crqu7JGR5oI3BwaqG0mw7CmXkO8=", + "lastModified": 1775036584, + "narHash": "sha256-zW0lyy7ZNNT/x8JhzFHBsP2IPx7ATZIPai4FJj12BgU=", "owner": "cachix", "repo": "git-hooks.nix", - "rev": "f799ae951fde0627157f40aec28dec27b22076d0", + "rev": "4e0eb042b67d863b1b34b3f64d52ceb9cd926735", "type": "github" }, "original": { @@ -582,11 +582,11 @@ "utils": "utils" }, "locked": { - "lastModified": 1774493375, - "narHash": "sha256-KYfvrXdr4U+J9evCJ1AkWhv1/QFy5Telmc1KHor3xgA=", + "lastModified": 1775270414, + "narHash": "sha256-hsPjh2dC4j5fJCf0caGUa5/xvI+TttnASrwpynQpYks=", "owner": "schembriaiden", "repo": "helium-browser-nix-flake", - "rev": "5339187341b31049c3116c8a52b2fc80362c83f3", + "rev": "55e5833c8c5f664b9d830e3ccd3ca56f7d7e2701", "type": "github" }, "original": { @@ -602,11 +602,11 @@ ] }, "locked": { - "lastModified": 1775047159, - "narHash": "sha256-UWM4VZvfKaPwA9FMu7iZha5YAE8vsEtUazk+rFxmbTY=", + "lastModified": 1775587248, + "narHash": "sha256-lMdrBTTTUprYOeoxRLmwtQAvyaxkWZtx+EEkeJHGxrY=", "owner": "nix-community", "repo": "home-manager", - "rev": "1ce9e62690dfdd7e76bd266ccb9a887778410eb2", + "rev": "9cc761169a1bbf1d9787cdbe9abf07f4bae213a1", "type": "github" }, "original": { @@ -1025,11 +1025,11 @@ "xwayland-satellite-unstable": "xwayland-satellite-unstable" }, "locked": { - "lastModified": 1775042939, - "narHash": "sha256-qcCBdnnKj8g/TiYmfDl3LmTdLYVPxr08yht9JaTXW00=", + "lastModified": 1775566751, + "narHash": "sha256-5Xkx4NQvl2azAQe3lCZCMUx4FiwGOlEb+I4kyycQYw8=", "owner": "sodiboo", "repo": "niri-flake", - "rev": "0e4df2c05361ed0f5e8738335369b304a0962b02", + "rev": "6aa49a9c5b82911459e230db5bd64289082d4354", "type": "github" }, "original": { @@ -1058,11 +1058,11 @@ "niri-unstable": { "flake": false, "locked": { - "lastModified": 1774616418, - "narHash": "sha256-z+dLkAS4bqytIlOI4h2MnjBJrSP4d1Awx0n+IV5YA3Y=", + "lastModified": 1775561155, + "narHash": "sha256-TK2IrqQivRcwqJa0suZMbcsN17CtA8Uu0v7CDnLATb0=", "owner": "YaLTeR", "repo": "niri", - "rev": "8f48f56fe19918b5cfa02e5d68a47ebaf7bf3dee", + "rev": "599db847f857b8a7ff78ce02f15acab5d5d9fee1", "type": "github" }, "original": { @@ -1080,12 +1080,12 @@ "nixpkgs-regression": "nixpkgs-regression" }, "locked": { - "lastModified": 1774642787, - "narHash": "sha256-5pg3HyPEUj/AXXwOQAwyieyDx0c1/1rf7+EsOCa1rJM=", - "rev": "cb9989b5b2329842fd7a2586429351d1ede16d04", - "revCount": 24851, + "lastModified": 1775583600, + "narHash": "sha256-/shs/3GA4R3rxhhqpPbEMnDZKbCvf3VpwnHB75nkTcI=", + "rev": "e9b4735be7b90cf49767faf5c36f770ac1bdc586", + "revCount": 24880, "type": "tarball", - "url": "https://api.flakehub.com/f/pinned/DeterminateSystems/nix-src/3.17.2/019d3110-f384-7933-a525-8f854039828f/source.tar.gz" + "url": "https://api.flakehub.com/f/pinned/DeterminateSystems/nix-src/3.17.3/019d6913-e8c2-7128-ba76-3dc4f6b58158/source.tar.gz" }, "original": { "type": "tarball", @@ -1099,11 +1099,11 @@ "nixpkgs": "nixpkgs_10" }, "locked": { - "lastModified": 1775013678, - "narHash": "sha256-TeFa1RL6W6V1Il8uICXgh/vwQKGOEdgXS365cR7JdDw=", + "lastModified": 1775530395, + "narHash": "sha256-9Eohxb0Ffb7nUh1eO4lRKcGjSPH5thaykcoz0/gG4x4=", "owner": "fufexan", "repo": "nix-gaming", - "rev": "3404429d748416af9a3790a2ccaf71d4b9ff157c", + "rev": "2e713958fe5fee54b3c648abfa76a9a10be0b355", "type": "github" }, "original": { @@ -1140,11 +1140,11 @@ ] }, "locked": { - "lastModified": 1774762074, - "narHash": "sha256-89Mh4Eb/5stVJX6kGagVMijcU2FmfeD8Qv7UXc5d92o=", + "lastModified": 1775365369, + "narHash": "sha256-DgH5mveLoau20CuTnaU5RXZWgFQWn56onQ4Du2CqYoI=", "owner": "nix-community", "repo": "nix-index-database", - "rev": "bc13aeaed568be76eab84df88ff39261bb52ff70", + "rev": "cef5cf82671e749ac87d69aadecbb75967e6f6c3", "type": "github" }, "original": { @@ -1170,11 +1170,11 @@ }, "nixos-hardware": { "locked": { - "lastModified": 1774933469, - "narHash": "sha256-OrnCQeUO2bqaWUl0lkDWyGWjKsOhtCyd7JSfTedQNUE=", + "lastModified": 1775490113, + "narHash": "sha256-2ZBhDNZZwYkRmefK5XLOusCJHnoeKkoN95hoSGgMxWM=", "owner": "NixOS", "repo": "nixos-hardware", - "rev": "f4c4c2c0c923d7811ac2a63ccc154767e4195337", + "rev": "c775c2772ba56e906cbeb4e0b2db19079ef11ff7", "type": "github" }, "original": { @@ -1232,11 +1232,11 @@ }, "nixpkgs-lib_2": { "locked": { - "lastModified": 1772328832, - "narHash": "sha256-e+/T/pmEkLP6BHhYjx6GmwP5ivonQQn0bJdH9YrRB+Q=", + "lastModified": 1774748309, + "narHash": "sha256-+U7gF3qxzwD5TZuANzZPeJTZRHS29OFQgkQ2kiTJBIQ=", "owner": "nix-community", "repo": "nixpkgs.lib", - "rev": "c185c7a5e5dd8f9add5b2f8ebeff00888b070742", + "rev": "333c4e0545a6da976206c74db8773a1645b5870a", "type": "github" }, "original": { @@ -1263,11 +1263,11 @@ }, "nixpkgs-stable": { "locked": { - "lastModified": 1775002709, - "narHash": "sha256-d3Yx83vSrN+2z/loBh4mJpyRqr9aAJqlke4TkpFmRJA=", + "lastModified": 1775305101, + "narHash": "sha256-/74n1oQPtKG52Yw41cbToxspxHbYz6O3vi+XEw16Qe8=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "bcd464ccd2a1a7cd09aa2f8d4ffba83b761b1d0e", + "rev": "36a601196c4ebf49e035270e10b2d103fe39076b", "type": "github" }, "original": { @@ -1279,11 +1279,11 @@ }, "nixpkgs-unstable": { "locked": { - "lastModified": 1774709303, - "narHash": "sha256-D3Q07BbIA2KnTcSXIqqu9P586uWxN74zNoCH3h2ESHg=", + "lastModified": 1775423009, + "narHash": "sha256-vPKLpjhIVWdDrfiUM8atW6YkIggCEKdSAlJPzzhkQlw=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "8110df5ad7abf5d4c0f6fb0f8f978390e77f9685", + "rev": "68d8aa3d661f0e6bd5862291b5bb263b2a6595c9", "type": "github" }, "original": { @@ -1311,11 +1311,11 @@ }, "nixpkgs_10": { "locked": { - "lastModified": 1774610258, - "narHash": "sha256-HaThtroVD9wRdx7KQk0B75JmFcXlMUoEdDFNOMOlsOs=", + "lastModified": 1775126147, + "narHash": "sha256-J0dZU4atgcfo4QvM9D92uQ0Oe1eLTxBVXjJzdEMQpD0=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "832efc09b4caf6b4569fbf9dc01bec3082a00611", + "rev": "8d8c1fa5b412c223ffa47410867813290cdedfef", "type": "github" }, "original": { @@ -1327,11 +1327,11 @@ }, "nixpkgs_11": { "locked": { - "lastModified": 1774709303, - "narHash": "sha256-D3Q07BbIA2KnTcSXIqqu9P586uWxN74zNoCH3h2ESHg=", + "lastModified": 1775423009, + "narHash": "sha256-vPKLpjhIVWdDrfiUM8atW6YkIggCEKdSAlJPzzhkQlw=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "8110df5ad7abf5d4c0f6fb0f8f978390e77f9685", + "rev": "68d8aa3d661f0e6bd5862291b5bb263b2a6595c9", "type": "github" }, "original": { @@ -1452,12 +1452,12 @@ }, "nixpkgs_7": { "locked": { - "lastModified": 1774273680, - "narHash": "sha256-a++tZ1RQsDb1I0NHrFwdGuRlR5TORvCEUksM459wKUA=", - "rev": "fdc7b8f7b30fdbedec91b71ed82f36e1637483ed", - "revCount": 968305, + "lastModified": 1775464765, + "narHash": "sha256-nex6TL2x1/sVHCyDWcvl1t/dbTedb9bAGC4DLf/pmYk=", + "rev": "83e29f2b8791f6dec20804382fcd9a666d744c07", + "revCount": 975711, "type": "tarball", - "url": "https://api.flakehub.com/f/pinned/DeterminateSystems/nixpkgs-weekly/0.1.968305%2Brev-fdc7b8f7b30fdbedec91b71ed82f36e1637483ed/019d1e65-315b-7c50-9232-ef9e46632115/source.tar.gz" + "url": "https://api.flakehub.com/f/pinned/DeterminateSystems/nixpkgs-weekly/0.1.975711%2Brev-83e29f2b8791f6dec20804382fcd9a666d744c07/019d6689-cde2-7061-b044-e0ef61ade488/source.tar.gz" }, "original": { "type": "tarball", @@ -1816,11 +1816,11 @@ "nixpkgs": "nixpkgs_13" }, "locked": { - "lastModified": 1775021133, - "narHash": "sha256-JB0u0evfSlmNg9HdGDxtXjaCcdKUpFPdSAMGxvJo5Pw=", + "lastModified": 1775453133, + "narHash": "sha256-VIlMG985ONqVqF+OnPuS5Shbz5k6tqbOWnDL7EH+IT4=", "owner": "0xc000022070", "repo": "zen-browser-flake", - "rev": "4bf1a6837064486c4f573a9d500c4cf3c1c075c0", + "rev": "8d0508ffceba8ad785ae442591dd115080a55142", "type": "github" }, "original": { diff --git a/flake.nix b/flake.nix index 706f3cd..7357cec 100644 --- a/flake.nix +++ b/flake.nix @@ -82,6 +82,24 @@ # Export sysbox NixOS module for external use nixosModules.sysbox = import ./modules/sysbox.nix; + nixosConfigurations.fern = nixpkgs.lib.nixosSystem { + system = "x86_64-linux"; + specialArgs = attrs; + modules = [ + determinate.nixosModules.default + home-manager.nixosModules.home-manager + { + home-manager.extraSpecialArgs = attrs; + home-manager.useGlobalPkgs = true; + home-manager.useUserPackages = true; + home-manager.users.dan = import ./servers/ui-mode/home.nix; + networking.hostName = "fern"; + imports = [ ./servers/fern/hardware-configuration.nix ]; + } + ./servers/ui-mode/configuration.nix + ]; + }; + nixosConfigurations.aura = nixpkgs.lib.nixosSystem { system = "x86_64-linux"; specialArgs = attrs; @@ -110,8 +128,10 @@ home-manager.extraSpecialArgs = attrs; home-manager.useGlobalPkgs = true; home-manager.useUserPackages = true; - home-manager.users.dan = import ./home.nix; + home-manager.users.dan = import ./servers/ui-mode/home.nix; home-manager.backupFileExtension = "backup"; + networking.hostName = "aura"; + imports = [ ./servers/aura/hardware-configuration.nix ]; } # nix-monitor.nixosModules.default @@ -126,7 +146,7 @@ # ]; # }; # } - ./configuration.nix + ./servers/ui-mode/configuration.nix # Import sysbox module ./modules/sysbox.nix nix-index-database.nixosModules.nix-index diff --git a/hardware-configuration.nix b/servers/aura/hardware-configuration.nix similarity index 100% rename from hardware-configuration.nix rename to servers/aura/hardware-configuration.nix diff --git a/servers/fern/configuration.nix b/servers/fern/configuration.nix new file mode 100644 index 0000000..39e2bbd --- /dev/null +++ b/servers/fern/configuration.nix @@ -0,0 +1,54 @@ +{ + config, + pkgs, + options, + nixpkgs-unstable, + lib, + dms, + ... +}: + +{ + + boot = { + kernelParams = [ + # attempt to fix nvidia perf + "nvidia_drm.fbdev=1" + "nvidia_drm.modeset=1" + "module_blacklist=i915" + "delayacct" + "initcall_blacklist=sysfb_init" + #"quiet" + #"splash" + "boot.shell_on_fail" + "loglevel=3" + "rd.systemd.show_status=false" + "rd.udev.log_level=3" + "udev.log_priority=3" + ]; + }; + hardware.graphics = { + enable = true; + # package = unstable-pkgs.mesa.drivers; + # Steam support + enable32Bit = true; + # package32 = unstable-pkgs.pkgsi686Linux.mesa.drivers; + extraPackages = with pkgs; [ + + # Required for modern Intel GPUs (Xe iGPU and ARC) + intel-media-driver # VA-API (iHD) userspace + vpl-gpu-rt # oneVPL (QSV) runtime + + # Optional (compute / tooling): + intel-compute-runtime # OpenCL (NEO) + Level Zero for Arc/Xe + # libvdpau-va-gl + nvidia-vaapi-driver + ]; + }; + hardware.nvidia = { + open = false; + modesetting.enable = true; + powerManagement.enable = true; + nvidiaSettings = true; + }; +} diff --git a/servers/fern/hardware-configuration.nix b/servers/fern/hardware-configuration.nix new file mode 100644 index 0000000..6a0dc87 --- /dev/null +++ b/servers/fern/hardware-configuration.nix @@ -0,0 +1,42 @@ +# 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. +{ 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/fed55c45-d36d-444d-82d0-e38a6c46f970"; + fsType = "btrfs"; + options = [ "subvol=@" ]; + }; + + fileSystems."/boot" = + { device = "/dev/disk/by-uuid/3CC7-A154"; + fsType = "vfat"; + options = [ "fmask=0077" "dmask=0077" ]; + }; + + swapDevices = + [ { device = "/dev/disk/by-uuid/7b5ed8d5-2831-462e-9b1f-8cd230f3ca25"; } + ]; + + # 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.enp7s0.useDHCP = lib.mkDefault true; + # networking.interfaces.wlp8s0.useDHCP = lib.mkDefault true; + + nixpkgs.hostPlatform = lib.mkDefault "x86_64-linux"; + hardware.cpu.amd.updateMicrocode = lib.mkDefault config.hardware.enableRedistributableFirmware; +} diff --git a/configuration.nix b/servers/ui-mode/configuration.nix similarity index 97% rename from configuration.nix rename to servers/ui-mode/configuration.nix index 36d5a05..fd5ff6e 100644 --- a/configuration.nix +++ b/servers/ui-mode/configuration.nix @@ -25,7 +25,7 @@ in # nixos-hardware.nixosModules.common-gpu-nvidia # nixos-hardware.nixosModules.common-pc-laptop # nixos-hardware.nixosModules.common-pc-laptop-ssd - ./hardware-configuration.nix +# ./hardware-configuration.nix dms.nixosModules.greeter # /etc/nixos/cachix.nix ]; @@ -85,7 +85,7 @@ in # }; # }; - networking.hostName = "aura"; + #networking.hostName = "aura"; # networking.proxy.default = "http://user:password@proxy:port/"; # networking.proxy.noProxy = "127.0.0.1,localhost,internal.domain"; # networking.nameservers = ["1.1.1.1"]; @@ -305,7 +305,7 @@ in # hardware.nvidia-container-toolkit.enable = true; # Enable sysbox for system containers - virtualisation.sysbox.enable = true; + #virtualisation.sysbox.enable = true; services.avahi.enable = true; @@ -321,15 +321,15 @@ in kernel.sysctl."kernel.sysrq" = 1; # Visuals - plymouth = { - enable = false; - theme = "deus_ex"; # motion is also cool - themePackages = with pkgs; [ - (adi1090x-plymouth-themes.override { - selected_themes = [ "deus_ex" ]; - }) - ]; - }; + #plymouth = { + # enable = false; + # theme = "deus_ex"; # motion is also cool + # themePackages = with pkgs; [ + # (adi1090x-plymouth-themes.override { + # selected_themes = [ "deus_ex" ]; + # }) + # ]; + #}; kernelParams = [ # attempt to fix nvidia perf #"nvidia_drm.fbdev=1" "nvidia_drm.modeset=1" "module_blacklist=i915" @@ -353,7 +353,7 @@ in # OBS Studio virtual camera extraModulePackages = with config.boot.kernelPackages; [ v4l2loopback - lenovo-legion-module + #lenovo-legion-module ]; extraModprobeConfig = '' options v4l2loopback devices=1 video_nr=1 card_label="OBS Cam" exclusive_caps=1 diff --git a/home.nix b/servers/ui-mode/home.nix similarity index 99% rename from home.nix rename to servers/ui-mode/home.nix index 38a2a78..4413d1d 100644 --- a/home.nix +++ b/servers/ui-mode/home.nix @@ -63,7 +63,7 @@ in helium opencode perf - obs-studio + #obs-studio flamegraph samply font-awesome diff --git a/with-extra.sh b/with-extra.sh new file mode 100644 index 0000000..a3a6e86 --- /dev/null +++ b/with-extra.sh @@ -0,0 +1 @@ +nixos-rebuild boot --option extra-substituters "https://cache.nixos.org https://nix-community.cachix.org https://hyprland.cachix.org https://nix-gaming.cachix.org https://colmena.cachix.org https://install.determinate.systems https://cache.garnix.io https://rusic.cachix.org" --option extra-trusted-public-keys "hyprland.cachix.org-1:a7pgxzMz7+chwVL3/pzj6jIBMioiJM7ypFP8PwtkuGc= nix-gaming.cachix.org-1:nbjlureqMbRAxR1gJ/f3hxemL9svXaZF/Ees8vCUUs4= nix-community.cachix.org-1:mB9FSh9qf2dCimDSUo8Zy7bkq5CX+/rkCWyvRCYg3Fs= cache.flakehub.com-3:hJuILl5sVK4iKm86JzgdXW12Y2Hwd5G07qKtHTOcDCM= cache.garnix.io:CTFPyKSLcx5RMJKfLo5EEPUObbA78b0YQ2DTCJXqr9g= cache.nixos.org-1:6NCHdD59X431o0gWypbMrAURkbJ16ZPMQFGspcDShjY= rusic.cachix.org-1:WXMpGpamblLUiJtcoxBxGGGGwIcWxGPJBUxarLiqWmw=" --flake ".#fern"