diff --git a/flake.lock b/flake.lock index 2918648..c153d49 100644 --- a/flake.lock +++ b/flake.lock @@ -49,11 +49,11 @@ ] }, "locked": { - "lastModified": 1716773194, - "narHash": "sha256-rskkGmWlvYFb+CXedBiL8eWEuED0Es0XR4CkJ11RQKY=", + "lastModified": 1719640067, + "narHash": "sha256-ZEJFGHnElbMH3JgnFANxOlJgniFamu9MemvHCMQZtpA=", "owner": "nix-community", "repo": "disko", - "rev": "10986091e47fb1180620b78438512b294b7e8f67", + "rev": "423b86a7f756421325e71663ada79a199bf13408", "type": "github" }, "original": { @@ -93,11 +93,11 @@ }, "locked": { "dir": "pkgs/firefox-addons", - "lastModified": 1716782615, - "narHash": "sha256-/Awpe+K8Npq35mhPw3gj+X/phWrvjXCEgbraxmtBlIU=", + "lastModified": 1719644951, + "narHash": "sha256-MTF+/uUIdFNeyzEFirWyza43AFfr3Syld7aPw2CSCkI=", "owner": "rycee", "repo": "nur-expressions", - "rev": "33111902039a1a779aef5574c7262dd8e9d688ae", + "rev": "590551ba0bb0f960c7fcd37d6ff3a429f7cc9dd1", "type": "gitlab" }, "original": { @@ -169,11 +169,11 @@ ] }, "locked": { - "lastModified": 1701473968, - "narHash": "sha256-YcVE5emp1qQ8ieHUnxt1wCZCC3ZfAS+SRRWZ2TMda7E=", + "lastModified": 1717285511, + "narHash": "sha256-iKzJcpdXih14qYVcZ9QC9XuZYnPc6T8YImb6dX166kw=", "owner": "hercules-ci", "repo": "flake-parts", - "rev": "34fed993f1674c8d06d58b37ce1e0fe5eebcb9f5", + "rev": "2a55567fcf15b1b1c7ed712a2c6fadaec7412ea8", "type": "github" }, "original": { @@ -190,11 +190,11 @@ ] }, "locked": { - "lastModified": 1715865404, - "narHash": "sha256-/GJvTdTpuDjNn84j82cU6bXztE0MSkdnTWClUCRub78=", + "lastModified": 1717285511, + "narHash": "sha256-iKzJcpdXih14qYVcZ9QC9XuZYnPc6T8YImb6dX166kw=", "owner": "hercules-ci", "repo": "flake-parts", - "rev": "8dc45382d5206bd292f9c2768b8058a8fd8311d9", + "rev": "2a55567fcf15b1b1c7ed712a2c6fadaec7412ea8", "type": "github" }, "original": { @@ -247,11 +247,11 @@ ] }, "locked": { - "lastModified": 1716736760, - "narHash": "sha256-h3RmnNknKYtVA+EvUSra6QAwfZjC2q1G8YA7W0gat8Y=", + "lastModified": 1719588253, + "narHash": "sha256-A03i8xiVgP14DCmV5P7VUv37eodCjY4e1iai0b2EuuM=", "owner": "nix-community", "repo": "home-manager", - "rev": "5d151429e1e79107acf6d06dcc5ace4e642ec239", + "rev": "7e68e55d2e16d3a1e92a679430728c35a30fd24e", "type": "github" }, "original": { @@ -262,11 +262,11 @@ }, "impermanence": { "locked": { - "lastModified": 1708968331, - "narHash": "sha256-VUXLaPusCBvwM3zhGbRIJVeYluh2uWuqtj4WirQ1L9Y=", + "lastModified": 1719091691, + "narHash": "sha256-AxaLX5cBEcGtE02PeGsfscSb/fWMnyS7zMWBXQWDKbE=", "owner": "nix-community", "repo": "impermanence", - "rev": "a33ef102a02ce77d3e39c25197664b7a636f9c30", + "rev": "23c1f06316b67cb5dabdfe2973da3785cfe9c34a", "type": "github" }, "original": { @@ -283,11 +283,11 @@ ] }, "locked": { - "lastModified": 1716618639, - "narHash": "sha256-H3kcJDVqDmXZ9IfVtqObL3JUx/a0ERn6gWBTn+7vwN4=", + "lastModified": 1719631702, + "narHash": "sha256-HMWxIehVO8pHp7OlqBYliiLOds34UJHSRn5FPdEb1j8=", "owner": "Jovian-Experiments", "repo": "Jovian-NixOS", - "rev": "a358c56a163b3b7d149571e853a8f75b2c1ceb38", + "rev": "2f9668e19aff06550cd154c87c0af120735a56a4", "type": "github" }, "original": { @@ -372,11 +372,11 @@ }, "nixlib_2": { "locked": { - "lastModified": 1712450863, - "narHash": "sha256-K6IkdtMtq9xktmYPj0uaYc8NsIqHuaAoRBaMgu9Fvrw=", + "lastModified": 1719103869, + "narHash": "sha256-kbTUy+/lfjUrMfV7JkTJwxowsFhi9Tb3BdbiOcIGcsc=", "owner": "nix-community", "repo": "nixpkgs.lib", - "rev": "3c62b6a12571c9a7f65ab037173ee153d539905f", + "rev": "f820613f886cd1aa4bcfd1dbaa6c83c8a3dcd863", "type": "github" }, "original": { @@ -399,11 +399,11 @@ "treefmt-nix": "treefmt-nix_2" }, "locked": { - "lastModified": 1716714838, - "narHash": "sha256-Wg/AitJwhglJQGP+8siy7vsmfaqfe4iBQljSzmFtYLk=", + "lastModified": 1718803059, + "narHash": "sha256-MYvDgSPWdF0hP6vzOhpqY+2a66ZLELFj+MUP5S/+dBY=", "owner": "nix-community", "repo": "nixos-anywhere", - "rev": "d8b8cc69b057601a090df1dddd9df7f09975be5b", + "rev": "ce18c086d8ca143d43ab20b3db20ab1e3e62c519", "type": "github" }, "original": { @@ -443,11 +443,11 @@ ] }, "locked": { - "lastModified": 1716210724, - "narHash": "sha256-iqQa3omRcHGpWb1ds75jS9ruA5R39FTmAkeR3J+ve1w=", + "lastModified": 1719450236, + "narHash": "sha256-fh0l6pLvuTrTBakFMQfK7lwpjvWd5i+CFyVs8TMzPNo=", "owner": "nix-community", "repo": "nixos-generators", - "rev": "d14b286322c7f4f897ca4b1726ce38cb68596c94", + "rev": "1867f28f87fcf4e817f165003aff967a5280aaab", "type": "github" }, "original": { @@ -458,11 +458,11 @@ }, "nixos-hardware": { "locked": { - "lastModified": 1716798306, - "narHash": "sha256-s8+OhT1WSPMoqbTawT30hj4NVMg+w03/a+2HVqcNhY0=", + "lastModified": 1719647737, + "narHash": "sha256-OvX/qQQ33zyB5ReRzm+U5+9Hh6EeYxHdd21tXL3p/eY=", "owner": "NixOS", "repo": "nixos-hardware", - "rev": "9a20e17a73b052d6be912adcee220cb483477094", + "rev": "231274268ff2250d4730e274b808f66ef91b6381", "type": "github" }, "original": { @@ -473,7 +473,7 @@ }, "nixos-images": { "inputs": { - "nixos-2311": [ + "nixos-stable": [ "nixos-anywhere", "nixos-stable" ], @@ -483,11 +483,11 @@ ] }, "locked": { - "lastModified": 1702375325, - "narHash": "sha256-kEdrh6IB7xh7YDwZ0ZVCngCs+uoS9gx4ydEoJRnM1Is=", + "lastModified": 1717994219, + "narHash": "sha256-ueTu01bYU5QXdL77psMkApYHpk339xNHg/M7ZzP3uPI=", "owner": "nix-community", "repo": "nixos-images", - "rev": "d655cc02fcb9ecdcca4f3fb307e291a4b5be1339", + "rev": "e2fd329c3a39a90bb43e1e2cf47c180ed57831bf", "type": "github" }, "original": { @@ -498,27 +498,27 @@ }, "nixos-stable": { "locked": { - "lastModified": 1702233072, - "narHash": "sha256-H5G2wgbim2Ku6G6w+NSaQaauv6B6DlPhY9fMvArKqRo=", + "lastModified": 1717696253, + "narHash": "sha256-1+ua0ggXlYYPLTmMl3YeYYsBXDSCqT+Gw3u6l4gvMhA=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "781e2a9797ecf0f146e81425c822dca69fe4a348", + "rev": "9b5328b7f761a7bbdc0e332ac4cf076a3eedb89b", "type": "github" }, "original": { "owner": "NixOS", - "ref": "nixos-23.11", + "ref": "nixos-24.05", "repo": "nixpkgs", "type": "github" } }, "nixpkgs": { "locked": { - "lastModified": 1716509168, - "narHash": "sha256-4zSIhSRRIoEBwjbPm3YiGtbd8HDWzFxJjw5DYSDy1n8=", + "lastModified": 1719506693, + "narHash": "sha256-C8e9S7RzshSdHB7L+v9I51af1gDM5unhJ2xO1ywxNH8=", "owner": "nixos", "repo": "nixpkgs", - "rev": "bfb7a882678e518398ce9a31a881538679f6f092", + "rev": "b2852eb9365c6de48ffb0dc2c9562591f652242a", "type": "github" }, "original": { @@ -528,6 +528,21 @@ "type": "github" } }, + "nixpkgs-24_05": { + "locked": { + "lastModified": 1717144377, + "narHash": "sha256-F/TKWETwB5RaR8owkPPi+SPJh83AQsm6KrQAlJ8v/uA=", + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "805a384895c696f802a9bf5bf4720f37385df547", + "type": "github" + }, + "original": { + "id": "nixpkgs", + "ref": "nixos-24.05", + "type": "indirect" + } + }, "pre-commit-hooks": { "inputs": { "flake-compat": [ @@ -545,11 +560,11 @@ ] }, "locked": { - "lastModified": 1716213921, - "narHash": "sha256-xrsYFST8ij4QWaV6HEokCUNIZLjjLP1bYC60K8XiBVA=", + "lastModified": 1717664902, + "narHash": "sha256-7XfBuLULizXjXfBYy/VV+SpYMHreNRHk9nKMsm1bgb4=", "owner": "cachix", "repo": "pre-commit-hooks.nix", - "rev": "0e8fcc54b842ad8428c9e705cb5994eaf05c26a0", + "rev": "cc4d466cb1254af050ff7bdf47f6d404a7c646d1", "type": "github" }, "original": { @@ -569,11 +584,11 @@ "pre-commit-hooks": "pre-commit-hooks" }, "locked": { - "lastModified": 1716708558, - "narHash": "sha256-zEVRyPA9SfLyJxh9L3K9ByFMmnb9UpFO6ERfvntsTy4=", + "lastModified": 1719606420, + "narHash": "sha256-4wKlDzPp8X/bc07PUNARUOfrDLeClwIgTMyJ8Ow0LwU=", "owner": "PrismLauncher", "repo": "PrismLauncher", - "rev": "764463ada7f25eb2da6df57f9f76b13623885fb3", + "rev": "196b2b5a3ed20dc4a23f4c2d62e1f46e886aba6a", "type": "github" }, "original": { @@ -608,14 +623,14 @@ "nixpkgs": [ "nixpkgs" ], - "utils": "utils" + "nixpkgs-24_05": "nixpkgs-24_05" }, "locked": { - "lastModified": 1714720456, - "narHash": "sha256-e0WFe1BHqX23ADpGBc4ZRu38Mg+GICCZCqyS6EWCbHc=", + "lastModified": 1718697807, + "narHash": "sha256-Enla61WFisytTYbWygPynEbu8vozjeGc6Obkj2GRj7o=", "owner": "simple-nixos-mailserver", "repo": "nixos-mailserver", - "rev": "41059fc548088e49e3ddb3a2b4faeb5de018e60f", + "rev": "290a995de5c3d3f08468fa548f0d55ab2efc7b6b", "type": "gitlab" }, "original": { @@ -660,11 +675,11 @@ ] }, "locked": { - "lastModified": 1716692524, - "narHash": "sha256-sALodaA7Zkp/JD6ehgwc0UCBrSBfB4cX66uFGTsqeFU=", + "lastModified": 1719268571, + "narHash": "sha256-pcUk2Fg5vPXLUEnFI97qaB8hto/IToRfqskFqsjvjb8=", "owner": "Mic92", "repo": "sops-nix", - "rev": "962797a8d7f15ed7033031731d0bb77244839960", + "rev": "c2ea1186c0cbfa4d06d406ae50f3e4b085ddc9b3", "type": "github" }, "original": { @@ -680,11 +695,11 @@ ] }, "locked": { - "lastModified": 1716771198, - "narHash": "sha256-vRDCDuFMvkvCjGT/N9K2lxG1E61vvq3TiU/4ZM36p8k=", + "lastModified": 1719449101, + "narHash": "sha256-rRrz763KKi6GnSZF4WF34kpJ9eMXR3AOPOWN/7hO1Zs=", "owner": "nix-community", "repo": "srvos", - "rev": "5d4550de420ee501d7fa0e6cd9031cd00354554c", + "rev": "e938f07e5cd9d11576d3860b68c117932c161006", "type": "github" }, "original": { @@ -693,29 +708,14 @@ "type": "github" } }, - "systems": { - "locked": { - "lastModified": 1681028828, - "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=", - "owner": "nix-systems", - "repo": "default", - "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e", - "type": "github" - }, - "original": { - "owner": "nix-systems", - "repo": "default", - "type": "github" - } - }, "tela-icon-theme": { "flake": false, "locked": { - "lastModified": 1716403738, - "narHash": "sha256-e5KRqlhFQyR+csYva0DBfrbLUABsYE33CLykXnF7vwE=", + "lastModified": 1719161478, + "narHash": "sha256-8YskzkxkbUsBt//UX3VAWronUam49P06G80u6xQ5PR0=", "owner": "vinceliuice", "repo": "Tela-icon-theme", - "rev": "68951e4cbddca28aac60d227e2a112360207a140", + "rev": "ef8c7b13cc34c127e9635568fa38a2778a16e19d", "type": "github" }, "original": { @@ -754,11 +754,11 @@ ] }, "locked": { - "lastModified": 1702376629, - "narHash": "sha256-9uAY8a7JN4DvLe/g4OoldqPbcNZ09YOVXID+CkIqL70=", + "lastModified": 1717850719, + "narHash": "sha256-npYqVg+Wk4oxnWrnVG7416fpfrlRhp/lQ6wQ4DHI8YE=", "owner": "numtide", "repo": "treefmt-nix", - "rev": "390018a9398f9763bfc05ffe6443ce0622cb9ba6", + "rev": "4fc1c45a5f50169f9f29f6a98a438fb910b834ed", "type": "github" }, "original": { @@ -766,24 +766,6 @@ "repo": "treefmt-nix", "type": "github" } - }, - "utils": { - "inputs": { - "systems": "systems" - }, - "locked": { - "lastModified": 1709126324, - "narHash": "sha256-q6EQdSeUZOG26WelxqkmR7kArjgWCdw5sfJVHPH/7j8=", - "owner": "numtide", - "repo": "flake-utils", - "rev": "d465f4819400de7c8d874d50b982301f28a84605", - "type": "github" - }, - "original": { - "owner": "numtide", - "repo": "flake-utils", - "type": "github" - } } }, "root": "root", diff --git a/systems/default.nix b/systems/default.nix index c80f36c..3700583 100644 --- a/systems/default.nix +++ b/systems/default.nix @@ -20,6 +20,7 @@ let in { kuraokami = mkSystem "x86_64-unknown-linux-gnu" "kuraokami"; + omoikane = mkSystem "x86_64-unknown-linux-gnu" "omoikane"; yokai = mkSystem "aarch64-unknown-linux-gnu" "yokai"; sukuna-biko-na = mkSystem "aarch64-unknown-linux-gnu" "sukuna-biko-na"; benzaiten = mkSystem "x86_64-unknown-linux-gnu" "benzaiten"; diff --git a/systems/omoikane/default.nix b/systems/omoikane/default.nix new file mode 100644 index 0000000..b7c682e --- /dev/null +++ b/systems/omoikane/default.nix @@ -0,0 +1,84 @@ +{ config, pkgs, lib, nixos-hardware, self, ... }: + +{ + imports = [ + ./hardware.nix + nixos-hardware.nixosModules.framework-16-7040-amd + self.inputs.srvos.nixosModules.desktop + ]; + + jopejoe1 = { + audio = { + enable = true; + }; + bluetooth.enable = true; + local.enable = true; + nix.enable = true; + plasma.enable = true; + printing.enable = true; + steam.enable = true; + ssh.enable = true; + sway.enable = true; + zerotierone.enable = true; + gui.enable = true; + keyboard = { + enable = true; + layout = "us"; + }; + user = { + jopejoe1.enable = true; + root.enable = true; + }; + boot.systemd.enable = true; + }; + + services.xserver = { + xkbVariant = "altgr-intl"; + }; + + services = { + pcscd.enable = true; + udev.packages = [ pkgs.yubikey-personalization ]; + fwupd.enable = true; + libinput.enable = true; + }; + + time.timeZone = "Europe/Berlin"; + + hardware = { + opengl = { + enable = true; + driSupport32Bit = true; + }; + gpgSmartcards.enable = true; + }; + + environment.systemPackages = with pkgs; [ + localPkgs.prismlauncher-withExtraStuff + goverlay + libreoffice-qt + thunderbird + ]; + + programs = { + adb.enable = true; + dconf.enable = true; + xwayland.enable = true; + kdeconnect.enable = true; + gamemode.enable = true; + gnupg.agent = { + enable = true; + enableSSHSupport = true; + pinentryPackage = pkgs.pinentry-qt; + }; + }; + + nix.settings.system-features = [ "benchmark" "big-parallel" "kvm" "nixos-test" ]; + + boot.binfmt.emulatedSystems = [ "riscv64-linux" "aarch64-linux" ]; + boot.plymouth = { + enable = true; + }; + + boot.initrd.systemd.enable = true; +} diff --git a/systems/omoikane/hardware.nix b/systems/omoikane/hardware.nix new file mode 100644 index 0000000..2644319 --- /dev/null +++ b/systems/omoikane/hardware.nix @@ -0,0 +1,38 @@ +# 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, modulesPath, ... }: + +{ + imports = [ (modulesPath + "/installer/scan/not-detected.nix") ]; + + boot.initrd.availableKernelModules = [ "nvme" "xhci_pci" "thunderbolt" "usbhid" "usb_storage" "sd_mod" ]; + boot.initrd.kernelModules = [ "amdgpu" ]; + boot.kernelModules = [ ]; + boot.extraModulePackages = [ ]; + + fileSystems."/" = + { device = "/dev/disk/by-uuid/6842a9de-c5fd-4648-b3b8-f76e56633825"; + fsType = "ext4"; + }; + + boot.initrd.luks.devices."luks-eaed8652-a306-4434-a187-71e6fcb13e71".device = "/dev/disk/by-uuid/eaed8652-a306-4434-a187-71e6fcb13e71"; + + fileSystems."/boot" = + { device = "/dev/disk/by-uuid/7C5A-EE45"; + fsType = "vfat"; + options = [ "fmask=0022" "dmask=0022" ]; + }; + + fileSystems."/home/jopejoe1/Public/games" = + { device = "/dev/sda"; + fsType = "bcachefs"; + options = [ "compression=zstd" ]; + }; + + swapDevices = [ ]; + + #nixpkgs.hostPlatform = lib.mkDefault "x86_64-linux"; + powerManagement.cpuFreqGovernor = lib.mkDefault "ondemand"; + hardware.cpu.amd.updateMicrocode = lib.mkDefault config.hardware.enableRedistributableFirmware; +}