diff --git a/flake.lock b/flake.lock index 82c666d..3e5a883 100644 --- a/flake.lock +++ b/flake.lock @@ -28,11 +28,11 @@ ] }, "locked": { - "lastModified": 1718588625, - "narHash": "sha256-8ZbrJq1jcmyzJ4SDkvd8JOZD4/fNUHpL4cpqVe4w3CU=", + "lastModified": 1719582740, + "narHash": "sha256-s4WsLu2L8EzF5Hg2TkelFLVhKGL108AySnlw8voPe5U=", "owner": "nix-community", "repo": "disko", - "rev": "8262659fc990cecdf6a8de74c3de7b6ec58c2276", + "rev": "115311bc395f24c1b553338fec4b3aa28cbf5ae2", "type": "github" }, "original": { @@ -99,11 +99,11 @@ }, "hardware": { "locked": { - "lastModified": 1718548414, - "narHash": "sha256-1obyIuQPR/Kq1j5/i/5EuAfQrDwjYnjCDG8iLtXmBhQ=", + "lastModified": 1719552654, + "narHash": "sha256-PX3msbC5KdwCDnucGtir3qzlzv+1fuiU4tk17nljFIE=", "owner": "nixos", "repo": "nixos-hardware", - "rev": "cde8f7e11f036160b0fd6a9e07dc4c8e4061cf06", + "rev": "3980e7816c99d9e4da7a7b762e5b294055b73b2f", "type": "github" }, "original": { @@ -120,11 +120,11 @@ "rust-overlay": "rust-overlay" }, "locked": { - "lastModified": 1718435104, - "narHash": "sha256-56gWNGKHHBGQH4ZTG89DO6JLYt6cRssJfm953IfPKPU=", + "lastModified": 1719626901, + "narHash": "sha256-uNPtomiPPWHAqZXc24+gL13FIrW+nShM9tfmtfyPqQU=", "owner": "helix-editor", "repo": "helix", - "rev": "dbacaaddcaa4a9dd39c73d0102d03ea7c24ca647", + "rev": "dca952c03ac1d3beab1e4b203648e3a31181dbf1", "type": "github" }, "original": { @@ -171,11 +171,11 @@ ] }, "locked": { - "lastModified": 1718368322, - "narHash": "sha256-VfMg3RsnRLQzbq0hFIh1dCM09b5C/F/qPFUOgU/CRi0=", + "lastModified": 1718450675, + "narHash": "sha256-jpsns6buS4bK+1sF8sL8AaixAiCRjA+nldTKvcwmvUs=", "owner": "hyprwm", "repo": "hyprcursor", - "rev": "dd3a853c8239d1c3f3f37de7d2b8ae4b4f3840df", + "rev": "66d5b46ff94efbfa6fa3d1d1b66735f1779c34a6", "type": "github" }, "original": { @@ -195,11 +195,11 @@ "xdph": "xdph" }, "locked": { - "lastModified": 1718638656, - "narHash": "sha256-nmQM1m5uQ3QQblKYOhqCg/GNU3WEd77p30yYUwAnq8Y=", + "lastModified": 1719613382, + "narHash": "sha256-DAWdnk0cCFbOZrdo9Ku0kbrlpv7pjnF+DQBnLiyuSSQ=", "owner": "hyprwm", "repo": "Hyprland", - "rev": "28ce0e0f804de50f75eab797bc404c1be0b54442", + "rev": "9c5dd59d4b1927b7d88e8e3c2e260eb01d95794b", "type": "github" }, "original": { @@ -222,11 +222,11 @@ ] }, "locked": { - "lastModified": 1691753796, - "narHash": "sha256-zOEwiWoXk3j3+EoF3ySUJmberFewWlagvewDRuWYAso=", + "lastModified": 1714869498, + "narHash": "sha256-vbLVOWvQqo4n1yvkg/Q70VTlPbMmTiCQfNTgcWDCfJM=", "owner": "hyprwm", "repo": "hyprland-protocols", - "rev": "0c2ce70625cb30aef199cb388f99e19a61a6ce03", + "rev": "e06482e0e611130cd1929f75e8c1cf679e57d161", "type": "github" }, "original": { @@ -276,11 +276,11 @@ ] }, "locked": { - "lastModified": 1718271409, - "narHash": "sha256-8KvVqtApNt4FWTdn1TqVvw00rpqyG9UuUPA2ilPVD1U=", + "lastModified": 1719316102, + "narHash": "sha256-dmRz128j/lJmMuTYeCYPfSBRHHQO3VeH4PbmoyAhHzw=", "owner": "hyprwm", "repo": "hyprutils", - "rev": "8e10e0626fb26a14b859b3811b6ed7932400c86e", + "rev": "1f6bbec5954f623ff8d68e567bddcce97cd2f085", "type": "github" }, "original": { @@ -301,11 +301,11 @@ ] }, "locked": { - "lastModified": 1718119275, - "narHash": "sha256-nqDYXATNkyGXVmNMkT19fT4sjtSPBDS1LLOxa3Fueo4=", + "lastModified": 1719067853, + "narHash": "sha256-mAnZG/eQy72Fp1ImGtqCgUrDumnR1rMZv2E/zgP4U74=", "owner": "hyprwm", "repo": "hyprwayland-scanner", - "rev": "1419520d5f7f38d35e05504da5c1b38212a38525", + "rev": "914f083741e694092ee60a39d31f693d0a6dc734", "type": "github" }, "original": { @@ -348,11 +348,11 @@ }, "nixpkgs_2": { "locked": { - "lastModified": 1718318537, - "narHash": "sha256-4Zu0RYRcAY/VWuu6awwq4opuiD//ahpc2aFHg2CWqFY=", + "lastModified": 1719075281, + "narHash": "sha256-CyyxvOwFf12I91PBWz43iGT1kjsf5oi6ax7CrvaMyAo=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "e9ee548d90ff586a6471b4ae80ae9cfcbceb3420", + "rev": "a71e967ef3694799d0c418c98332f7ff4cc5f6af", "type": "github" }, "original": { @@ -364,11 +364,11 @@ }, "nixpkgs_3": { "locked": { - "lastModified": 1718437845, - "narHash": "sha256-ZT7Oc1g4I4pHVGGjQFnewFVDRLH5cIZhEzODLz9YXeY=", + "lastModified": 1719426051, + "narHash": "sha256-yJL9VYQhaRM7xs0M867ZFxwaONB9T2Q4LnGo1WovuR4=", "owner": "nixos", "repo": "nixpkgs", - "rev": "752c634c09ceb50c45e751f8791cb45cb3d46c9e", + "rev": "89c49874fb15f4124bf71ca5f42a04f2ee5825fd", "type": "github" }, "original": { @@ -483,11 +483,11 @@ ] }, "locked": { - "lastModified": 1718506969, - "narHash": "sha256-Pm9I/BMQHbsucdWf6y9G3xBZh3TMlThGo4KBbeoeczg=", + "lastModified": 1719268571, + "narHash": "sha256-pcUk2Fg5vPXLUEnFI97qaB8hto/IToRfqskFqsjvjb8=", "owner": "Mic92", "repo": "sops-nix", - "rev": "797ce4c1f45a85df6dd3d9abdc53f2691bea9251", + "rev": "c2ea1186c0cbfa4d06d406ae50f3e4b085ddc9b3", "type": "github" }, "original": { @@ -543,11 +543,11 @@ ] }, "locked": { - "lastModified": 1718272114, - "narHash": "sha256-KsX7sAwkEFpXiwyjt0HGTnnrUU58wW1jlzj5IA/LRz8=", + "lastModified": 1718619174, + "narHash": "sha256-FWW68AVYmB91ZDQnhLMBNCUUTCjb1ZpO2k2KIytHtkA=", "owner": "hyprwm", "repo": "xdg-desktop-portal-hyprland", - "rev": "24be4a26f0706e456fca1b61b8c79f7486a9e86d", + "rev": "c7894aa54f9a7dbd16df5cd24d420c8af22d5623", "type": "github" }, "original": { diff --git a/flake.nix b/flake.nix index c8a2bde..9d5c390 100644 --- a/flake.nix +++ b/flake.nix @@ -208,6 +208,27 @@ ]; }; + htpc = nixpkgs.lib.nixosSystem { + system = "x86_64-linux"; + modules = with nixosModules; [ + common + + hardware.nixosModules.common-pc-ssd + + graphical-workstation + + ./nixos/htpc.nix + + { + home-manager.users.daniel = { + imports = with homeManagerModules; [ + linux-desktop-environment-config + ]; + }; + } + ]; + }; + foxtrot = nixpkgs.lib.nixosSystem { system = "x86_64-linux"; modules = with nixosModules; [ @@ -231,7 +252,6 @@ cargo firefox-no-tabs linux-desktop-environment-config - slippi.homeManagerModules.default ]; }; } diff --git a/modules/nixos/default.nix b/modules/nixos/default.nix index 403269e..845c36b 100644 --- a/modules/nixos/default.nix +++ b/modules/nixos/default.nix @@ -385,6 +385,30 @@ environment.systemPackages = with pkgs; [ wl-clipboard + inkscape + krita + noto-fonts + vlc + wl-clipboard + + libsForQt5.qt5.qtvirtualkeyboard + maliit-keyboard + maliit-framework + + libsForQt5.kate + # libsForQt5.kdenlive + # libsForQt5.merkuro + libsForQt5.kcalc + # libsForQt5.neochat + libsForQt5.filelight + libsForQt5.krdc + libsForQt5.krfb + libsForQt5.kclock + libsForQt5.kweather + libsForQt5.ktorrent + # libsForQt5.kdevelop + # libsForQt5.kdialog + libsForQt5.kdeplasma-addons ]; programs.gnupg.agent = { diff --git a/nixos/htpc.nix b/nixos/htpc.nix new file mode 100644 index 0000000..b0d8072 --- /dev/null +++ b/nixos/htpc.nix @@ -0,0 +1,32 @@ +{ + config, + lib, + ... +}: { + networking.hostName = "htpc"; + + networking.networkmanager.enable = true; + + boot.loader.grub.enable = true; + boot.loader.grub.device = "/dev/sda"; + boot.loader.grub.useOSProber = true; + + boot.initrd.availableKernelModules = ["xhci_pci" "ahci" "usbhid" "usb_storage" "sd_mod"]; + boot.initrd.kernelModules = ["8821au" "8812au"]; + boot.kernelModules = ["kvm-intel"]; + boot.extraModulePackages = [ + # pkgs.rtl8811au + config.boot.kernelPackages.rtl8812au + config.boot.kernelPackages.rtl8821au + ]; + + fileSystems."/" = { + device = "/dev/disk/by-uuid/86d8ded0-1c6f-4a79-901c-2d59c11b5ca8"; + fsType = "ext4"; + }; + + swapDevices = []; + + nixpkgs.hostPlatform = lib.mkDefault "x86_64-linux"; + hardware.cpu.intel.updateMicrocode = lib.mkDefault config.hardware.enableRedistributableFirmware; +}