diff --git a/README.md b/README.md index ed035938..5f544241 100644 --- a/README.md +++ b/README.md @@ -49,9 +49,11 @@ nix develop -c /etc/nixos/git/docs/setup.sh --- # 📋 To Do List -* [ ] Revert to 24.05 and not unstable +* [x] Revert to 24.05 and not unstable * Currently seeing issues with the ssh-to-pgp package. * Maybe find a way to pull it from 24.05 temporarily + * [ ] Add audio to rdesktop xrdp config + * [ ] Framework volume buttons don't work on KDE ## home-manager * [ ] Find a way to remove all default search engines in Firefox (Google, Amazon, etc) diff --git a/flake.lock b/flake.lock index e76bb97e..41a4e37c 100644 --- a/flake.lock +++ b/flake.lock @@ -776,15 +776,16 @@ ] }, "locked": { - "lastModified": 1719037157, - "narHash": "sha256-aOKd8+mhBsLQChCu1mn/W5ww79ta5cXVE59aJFrifM8=", + "lastModified": 1718530513, + "narHash": "sha256-BmO8d0r+BVlwWtMLQEYnwmngqdXIuyFzMwvmTcLMee8=", "owner": "nix-community", "repo": "home-manager", - "rev": "cd886711998fe5d9ff7979fdd4b4cbd17b1f1511", + "rev": "a1fddf0967c33754271761d91a3d921772b30d0e", "type": "github" }, "original": { "owner": "nix-community", + "ref": "release-24.05", "repo": "home-manager", "type": "github" } @@ -892,11 +893,11 @@ "xdph": "xdph" }, "locked": { - "lastModified": 1719093162, - "narHash": "sha256-WA48JNc8e3Irz0gpSE/vby67RlC+m+MJlQ6sZQId1EI=", + "lastModified": 1719164993, + "narHash": "sha256-yfDdjbR7Mgwk0c4MQNLHQbPUOXyp07yxsyTYrvLWjGA=", "owner": "hyprwm", "repo": "Hyprland", - "rev": "7f09646ab8b5b6d9f835681d0af5d7a0dc29d8f1", + "rev": "8a68199a0ceb2894a5d9cc300961c38123ac0312", "type": "github" }, "original": { @@ -1062,11 +1063,11 @@ "nixpkgs-lib": "nixpkgs-lib" }, "locked": { - "lastModified": 1718539824, - "narHash": "sha256-pVGgM3MOOpMMqprkrMkuWwhC1dsw6Xt7aRGaBkMQqG0=", + "lastModified": 1719144654, + "narHash": "sha256-3eKm5xwc2M4WJ1wQ4POID8jpDARWXEAMcuh1xDItJl8=", "owner": "nix-community", "repo": "lib-aggregate", - "rev": "17a1c1bfca963a2776969866aaa07744d7ac9135", + "rev": "7f1a89b58b9d3ba655a381f8ab1806a8ccdfb03a", "type": "github" }, "original": { @@ -1104,11 +1105,11 @@ "treefmt-nix": "treefmt-nix" }, "locked": { - "lastModified": 1719073535, - "narHash": "sha256-G3LQrKVR5J31hpM8iFMHPchj7HRu0hcLarqLAyRALsI=", + "lastModified": 1719174496, + "narHash": "sha256-B9xJfKbmu9WOHMusgCaJokT0ATN0CXP/pC8op1XPJTA=", "owner": "nix-community", "repo": "nix-eval-jobs", - "rev": "630134d3ee9f33caef30b658537463053e9cfde2", + "rev": "413e7df4eefc03bfd019f797939d277305d789f5", "type": "github" }, "original": { @@ -1215,11 +1216,11 @@ }, "nixos-hardware": { "locked": { - "lastModified": 1719069430, - "narHash": "sha256-d9KzCJv3UG6nX9Aur5OSEf4Uj+ywuxojhiCiRKYVzXA=", + "lastModified": 1719145664, + "narHash": "sha256-+0bBlerLxsHUJcKPDWZM1wL3V9bzCFjz+VyRTG8fnUA=", "owner": "NixOS", "repo": "nixos-hardware", - "rev": "e8232c132a95ddc62df9d404120ad4ff53862910", + "rev": "c3e48cbd88414f583ff08804eb57b0da4c194f9e", "type": "github" }, "original": { @@ -1246,11 +1247,11 @@ }, "nixpkgs-lib": { "locked": { - "lastModified": 1718499101, - "narHash": "sha256-2oGRKxl3qEyRH2DJRiVtLeJICcybXMkqjWQYODINL9M=", + "lastModified": 1719103869, + "narHash": "sha256-kbTUy+/lfjUrMfV7JkTJwxowsFhi9Tb3BdbiOcIGcsc=", "owner": "nix-community", "repo": "nixpkgs.lib", - "rev": "6fba0c5a27b984914794ffdab8d7bb5c29ab11b6", + "rev": "f820613f886cd1aa4bcfd1dbaa6c83c8a3dcd863", "type": "github" }, "original": { @@ -1314,11 +1315,11 @@ "nixpkgs": "nixpkgs_6" }, "locked": { - "lastModified": 1719131785, - "narHash": "sha256-tfJKV1mwjqbwQI/JBmPyKSk3+RGN2SymxH/RiJIJnZU=", + "lastModified": 1719174979, + "narHash": "sha256-56fpwnm9kEN1EwWP/QK5vrVKprGqB8P1nykzNwU+njY=", "owner": "nix-community", "repo": "nixpkgs-wayland", - "rev": "791480b98714d4488a7bea8b91453c8546d18d8e", + "rev": "3c5a40d3dd8e1383b027570b27514aef09b85bd8", "type": "github" }, "original": { @@ -1361,16 +1362,16 @@ }, "nixpkgs_4": { "locked": { - "lastModified": 1719075281, - "narHash": "sha256-CyyxvOwFf12I91PBWz43iGT1kjsf5oi6ax7CrvaMyAo=", + "lastModified": 1718835956, + "narHash": "sha256-wM9v2yIxClRYsGHut5vHICZTK7xdrUGfrLkXvSuv6s4=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "a71e967ef3694799d0c418c98332f7ff4cc5f6af", + "rev": "dd457de7e08c6d06789b1f5b88fc9327f4d96309", "type": "github" }, "original": { "id": "nixpkgs", - "ref": "nixos-unstable", + "ref": "nixos-24.05", "type": "indirect" } }, @@ -1497,11 +1498,11 @@ }, "nur": { "locked": { - "lastModified": 1719130969, - "narHash": "sha256-U+a/N3m0tg36KD/SjGyveV5hx8VYSnFHiKRjlt+iyL4=", + "lastModified": 1719180650, + "narHash": "sha256-KqAz2NpqjotMTi+54S27B36/P9576t6ol1OO91F7kpA=", "owner": "nix-community", "repo": "NUR", - "rev": "88407857c90e39f2654a0ef347c2c920c25f453c", + "rev": "c35808fdf00eac21e675b7ec691f623fe0653553", "type": "github" }, "original": { @@ -1598,11 +1599,11 @@ ] }, "locked": { - "lastModified": 1719082099, - "narHash": "sha256-Ga2Yi3rebXGk7ybFlwrkbs2jee364dmmbsvcVWU20ic=", + "lastModified": 1719145147, + "narHash": "sha256-Es/sgvSvVzv3DfWcl3OMABIuBUWiYXx2uwT94hQO4Io=", "owner": "pjones", "repo": "plasma-manager", - "rev": "675d5fc9cd4dcfe0fc94d0fc4cb38a27fff595b0", + "rev": "5db39ce2fa95f4dfe1bdfe371fd9a90c65b3a9a0", "type": "github" }, "original": { @@ -1767,11 +1768,11 @@ "nixpkgs": "nixpkgs_9" }, "locked": { - "lastModified": 1718971834, - "narHash": "sha256-k+BjPJgjmG+u8VwyzjA6YxkoBn9tP1m19h0CQGc3iGM=", + "lastModified": 1719152448, + "narHash": "sha256-Acbi1Crd+UEbpPW8IR0ZGRKV+JCnMXDS2cglFQJvRPM=", "owner": "danth", "repo": "stylix", - "rev": "97dcf3c216fe5fb19c406e39f265d3bc9b851377", + "rev": "0fc4e9f1449a9dce4be7a1ecedd97949da591181", "type": "github" }, "original": { diff --git a/flake.nix b/flake.nix index fef840c2..7c1d94a3 100644 --- a/flake.nix +++ b/flake.nix @@ -2,11 +2,11 @@ description = "NixOS System Config"; inputs = { # Stable Packages - nixpkgs.url = "nixpkgs/nixos-unstable"; + nixpkgs.url = "nixpkgs/nixos-24.05"; # Unstable Packages nixpkgs-unstable.url = "nixpkgs/nixos-unstable"; # home-manager - Dotfile mnagement - add /master at the end to pull from master - home-manager.url = "github:nix-community/home-manager"; + home-manager.url = "github:nix-community/home-manager/release-24.05"; home-manager.inputs.nixpkgs.follows = "nixpkgs"; # Nix colorizer / themer stylix.url = "github:danth/stylix"; diff --git a/nixos/common/modules/hosts.nix b/nixos/common/modules/hosts.nix index c23365ba..aa6bc617 100644 --- a/nixos/common/modules/hosts.nix +++ b/nixos/common/modules/hosts.nix @@ -55,11 +55,6 @@ let sha256 = "19aebdc75324179473cb0f192570c19559c1486ae7a4620191d0af1e31769025"; }); - Basic = builtins.readFile(builtins.fetchurl { - url = "https://github.com/blocklistproject/Lists/raw/f2bdd1deab05f6a22739671cc20a17444e53699f/basic.txt"; - sha256 = "1d778ada1a5fa8758aab0950a2a6750463b88dd67e0d54702bc37d63a77d2d51"; - }); - in { networking.extraHosts = lib.mkMerge [ Twitter @@ -73,6 +68,5 @@ in { Scam Abuse Ads - Basic ]; } diff --git a/nixos/hosts/nixos-desktop/default.nix b/nixos/hosts/nixos-desktop/default.nix index 4c2f9602..2fb6a554 100644 --- a/nixos/hosts/nixos-desktop/default.nix +++ b/nixos/hosts/nixos-desktop/default.nix @@ -46,7 +46,12 @@ }; hardware = { - graphics.enable = true; + opengl = { + enable = true; + driSupport32Bit = true; + driSupport = true; + }; + nvidia = { open = false; nvidiaSettings = true; diff --git a/nixos/hosts/nixos-framework/default.nix b/nixos/hosts/nixos-framework/default.nix index 7e8a77f5..9cebf6de 100644 --- a/nixos/hosts/nixos-framework/default.nix +++ b/nixos/hosts/nixos-framework/default.nix @@ -41,7 +41,14 @@ # Set the networking hostname: networking.hostName = "nixos-framework"; - hardware.graphics.enable = true; + hardware = { + opengl = { + enable = true; + driSupport32Bit = true; + driSupport = true; + }; + }; + programs.gamemode = { enable = true; diff --git a/nixos/hosts/steamdeck/default.nix b/nixos/hosts/steamdeck/default.nix index aeae951c..847950c5 100644 --- a/nixos/hosts/steamdeck/default.nix +++ b/nixos/hosts/steamdeck/default.nix @@ -1,4 +1,4 @@ -{ inputs, config, lib, username, pkgs, ... }: { +{ inputs, config, lib, username, hostname, pkgs, ... }: { imports = [ inputs.jovian.nixosModules.default ./disks.nix @@ -20,7 +20,7 @@ # Set your time zone. time.timeZone = "Asia/Tokyo"; # Set the networking hostname: - networking.hostName = "steamdeck"; + networking.hostName = hostname; environment.systemPackages = with pkgs; [ python3 # decky-loader required