diff --git a/flake.lock b/flake.lock index f14db77..b4aa8e0 100644 --- a/flake.lock +++ b/flake.lock @@ -53,11 +53,11 @@ "base16-helix": { "flake": false, "locked": { - "lastModified": 1696727917, - "narHash": "sha256-FVrbPk+NtMra0jtlC5oxyNchbm8FosmvXIatkRbYy1g=", + "lastModified": 1720809814, + "narHash": "sha256-numb3xigRGnr/deF7wdjBwVg7fpbTH7reFDkJ75AJkY=", "owner": "tinted-theming", "repo": "base16-helix", - "rev": "dbe1480d99fe80f08df7970e471fac24c05f2ddb", + "rev": "34f41987bec14c0f3f6b2155c19787b1f6489625", "type": "github" }, "original": { @@ -186,11 +186,11 @@ ] }, "locked": { - "lastModified": 1720327769, - "narHash": "sha256-kAsg3Lg4YKKpGw+f1W2s5hzjP8B0y/juowvjK8utIag=", + "lastModified": 1722067813, + "narHash": "sha256-nxpzoKXwn+8RsxpxwD86mtEscOMw64ZD/vGSNWzGMlA=", "owner": "nix-community", "repo": "home-manager", - "rev": "6b7ce96f34b324e4e104abc30d06955d216bac71", + "rev": "975b83ca560d17db51a66cb2b0dc0e44213eab27", "type": "github" }, "original": { @@ -224,15 +224,17 @@ "nixos-cosmic": { "inputs": { "flake-compat": "flake-compat", - "nixpkgs": "nixpkgs", + "nixpkgs": [ + "nixpkgs" + ], "nixpkgs-stable": "nixpkgs-stable" }, "locked": { - "lastModified": 1720402578, - "narHash": "sha256-Zw+4iAKfIaSu0x8HZeQzC8r8Gktz8+HdZSdVdZ8buqs=", + "lastModified": 1721160462, + "narHash": "sha256-/VxDWswjySr3CUuMRP4OBBP3sFSps7r1Bh/AJkZSdVk=", "owner": "lilyinstarlight", "repo": "nixos-cosmic", - "rev": "bbd44e1198e9a998af04b6973d3f3a2c9950ae46", + "rev": "b2d62f3b793495c1156cba6a99512cd95ac2c439", "type": "github" }, "original": { @@ -243,27 +245,26 @@ }, "nixpkgs": { "locked": { - "lastModified": 1720031269, - "narHash": "sha256-rwz8NJZV+387rnWpTYcXaRNvzUSnnF9aHONoJIYmiUQ=", + "lastModified": 1721924956, + "narHash": "sha256-Sb1jlyRO+N8jBXEX9Pg9Z1Qb8Bw9QyOgLDNMEpmjZ2M=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "9f4128e00b0ae8ec65918efeba59db998750ead6", + "rev": "5ad6a14c6bf098e98800b091668718c336effc95", "type": "github" }, "original": { - "owner": "NixOS", + "id": "nixpkgs", "ref": "nixos-unstable", - "repo": "nixpkgs", - "type": "github" + "type": "indirect" } }, "nixpkgs-stable": { "locked": { - "lastModified": 1720244366, - "narHash": "sha256-WrDV0FPMVd2Sq9hkR5LNHudS3OSMmUrs90JUTN+MXpA=", + "lastModified": 1720954236, + "narHash": "sha256-1mEKHp4m9brvfQ0rjCca8P1WHpymK3TOr3v34ydv9bs=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "49ee0e94463abada1de470c9c07bfc12b36dcf40", + "rev": "53e81e790209e41f0c1efa9ff26ff2fd7ab35e27", "type": "github" }, "original": { @@ -275,11 +276,11 @@ }, "nixpkgs-stable_2": { "locked": { - "lastModified": 1720282526, - "narHash": "sha256-dudRkHPRivMNOhd04YI+v4sWvn2SnN5ODSPIu5IVbco=", + "lastModified": 1721524707, + "narHash": "sha256-5NctRsoE54N86nWd0psae70YSLfrOek3Kv1e8KoXe/0=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "550ac3e955c30fe96dd8b2223e37e0f5d225c927", + "rev": "556533a23879fc7e5f98dd2e0b31a6911a213171", "type": "github" }, "original": { @@ -291,26 +292,11 @@ }, "nixpkgs_2": { "locked": { - "lastModified": 1720031269, - "narHash": "sha256-rwz8NJZV+387rnWpTYcXaRNvzUSnnF9aHONoJIYmiUQ=", + "lastModified": 1721466660, + "narHash": "sha256-pFSxgSZqZ3h+5Du0KvEL1ccDZBwu4zvOil1zzrPNb3c=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "9f4128e00b0ae8ec65918efeba59db998750ead6", - "type": "github" - }, - "original": { - "id": "nixpkgs", - "ref": "nixos-unstable", - "type": "indirect" - } - }, - "nixpkgs_3": { - "locked": { - "lastModified": 1720181791, - "narHash": "sha256-i4vJL12/AdyuQuviMMd1Hk2tsGt02hDNhA0Zj1m16N8=", - "owner": "NixOS", - "repo": "nixpkgs", - "rev": "4284c2b73c8bce4b46a6adf23e16d9e2ec8da4bb", + "rev": "6e14bbce7bea6c4efd7adfa88a40dac750d80100", "type": "github" }, "original": { @@ -320,7 +306,7 @@ "type": "github" } }, - "nixpkgs_4": { + "nixpkgs_3": { "locked": { "lastModified": 1714912032, "narHash": "sha256-clkcOIkg8G4xuJh+1onLG4HPMpbtzdLv4rHxFzgsH9c=", @@ -340,23 +326,22 @@ "inputs": { "home-manager": "home-manager", "nixos-cosmic": "nixos-cosmic", - "nixpkgs": "nixpkgs_2", + "nixpkgs": "nixpkgs", "sops-nix": "sops-nix", - "stable-nixpkgs": "stable-nixpkgs", "stylix": "stylix" } }, "sops-nix": { "inputs": { - "nixpkgs": "nixpkgs_3", + "nixpkgs": "nixpkgs_2", "nixpkgs-stable": "nixpkgs-stable_2" }, "locked": { - "lastModified": 1720321395, - "narHash": "sha256-kcI8q9Nh8/CSj0ygfWq1DLckHl8IHhFarL8ie6g7OEk=", + "lastModified": 1721688883, + "narHash": "sha256-9jsjsRKtJRqNSTXKj9zuDFRf2PGix30nMx9VKyPgD2U=", "owner": "Mic92", "repo": "sops-nix", - "rev": "c184aca4db5d71c3db0c8cbfcaaec337a5d065ea", + "rev": "aff2f88277dabe695de4773682842c34a0b7fd54", "type": "github" }, "original": { @@ -365,21 +350,6 @@ "type": "github" } }, - "stable-nixpkgs": { - "locked": { - "lastModified": 1719957072, - "narHash": "sha256-gvFhEf5nszouwLAkT9nWsDzocUTqLWHuL++dvNjMp9I=", - "owner": "NixOS", - "repo": "nixpkgs", - "rev": "7144d6241f02d171d25fba3edeaf15e0f2592105", - "type": "github" - }, - "original": { - "id": "nixpkgs", - "ref": "nixos-23.11", - "type": "indirect" - } - }, "stylix": { "inputs": { "base16": "base16", @@ -392,14 +362,14 @@ "flake-compat": "flake-compat_2", "gnome-shell": "gnome-shell", "home-manager": "home-manager_2", - "nixpkgs": "nixpkgs_4" + "nixpkgs": "nixpkgs_3" }, "locked": { - "lastModified": 1719525570, - "narHash": "sha256-xSO/H67GAHEW0siD2PHoO/e97MbROL3r3s5SpF6A6Dc=", + "lastModified": 1721989207, + "narHash": "sha256-APKQeMMdh1O1W3OnxEvNfHNBiE4eRvEN6rosFr2dLHE=", "owner": "danth", "repo": "stylix", - "rev": "1ff9d37d27377bfe8994c24a8d6c6c1734ffa116", + "rev": "b9de20c76e8d5c13cf2304d23cf589803c311670", "type": "github" }, "original": { diff --git a/flake.nix b/flake.nix index 492787f..87fd1d2 100644 --- a/flake.nix +++ b/flake.nix @@ -1,16 +1,17 @@ { description = "A flake using my config"; - inputs = { nixpkgs.url = "nixpkgs/nixos-unstable"; - stable-nixpkgs.url = "nixpkgs/nixos-23.11"; home-manager = { url = "github:nix-community/home-manager/master"; inputs.nixpkgs.follows = "nixpkgs"; }; stylix.url = "github:danth/stylix"; sops-nix.url = "github:Mic92/sops-nix"; - nixos-cosmic.url = "github:lilyinstarlight/nixos-cosmic"; + nixos-cosmic = { + url = "github:lilyinstarlight/nixos-cosmic"; + inputs.nixpkgs.follows = "nixpkgs"; + }; }; outputs = inputs: let @@ -93,10 +94,7 @@ [ ./hardware/vm.nix ./nixos/workstation.nix - { - services.desktopManager.cosmic.enable = true; - services.displayManager.cosmic-greeter.enable = true; - } + ./nixos/programs/cosmic.nix ] [ ./home/workstation.nix ]; diff --git a/hardware/vm.nix b/hardware/vm.nix index f71fc8c..878ef4e 100644 --- a/hardware/vm.nix +++ b/hardware/vm.nix @@ -1,7 +1,7 @@ {config, ...}: let user = config.user; in { - hardware.opengl.enable = true; + hardware.graphics.enable = true; boot.kernelModules = ["kvm-amd" "qxl" "bochs_drm"]; system.stateVersion = "24.05"; diff --git a/home/default.nix b/home/default.nix index 2f4091e..c75a258 100644 --- a/home/default.nix +++ b/home/default.nix @@ -35,7 +35,7 @@ libsixel yt-dlp ytfzf - neofetch + fastfetch tree ansible ]; diff --git a/home/programs/graphical.nix b/home/programs/graphical.nix index 3c3823e..a10397a 100644 --- a/home/programs/graphical.nix +++ b/home/programs/graphical.nix @@ -32,7 +32,7 @@ shortwave # other - element-desktop + nheko brave vieb bitwarden diff --git a/nixos/programs/cosmic.nix b/nixos/programs/cosmic.nix new file mode 100644 index 0000000..6372038 --- /dev/null +++ b/nixos/programs/cosmic.nix @@ -0,0 +1,11 @@ +{inputs, ...}: { + imports = [ + inputs.nixos-cosmic.nixosModules.default + ]; + nix.settings = { + substituters = [ "https://cosmic.cachix.org/" ]; + trusted-public-keys = [ "cosmic.cachix.org-1:Dya9IyXD4xdBehWjrkPv6rtxpmMdRel02smYzA85dPE=" ]; + }; + services.desktopManager.cosmic.enable = true; + services.displayManager.cosmic-greeter.enable = true; +} diff --git a/nixos/programs/gamer.nix b/nixos/programs/gamer.nix index 5f941eb..67cc40e 100644 --- a/nixos/programs/gamer.nix +++ b/nixos/programs/gamer.nix @@ -1,4 +1,4 @@ -{lib, ...}: { +{lib, pkgs, ...}: { nixpkgs.config.allowUnfreePredicate = pkg: builtins.elem (lib.getName pkg) [ "steam" @@ -6,9 +6,12 @@ "steam-original" "osu-lazer" ]; - programs.steam = { enable = true; + extest.enable = true; + extraCompatPackages = with pkgs; [ + proton-ge-bin + ]; remotePlay.openFirewall = true; dedicatedServer.openFirewall = true; }; diff --git a/nixos/workstation.nix b/nixos/workstation.nix index a62914e..cf8ef14 100644 --- a/nixos/workstation.nix +++ b/nixos/workstation.nix @@ -6,16 +6,11 @@ }: { imports = [ inputs.stylix.nixosModules.stylix - inputs.nixos-cosmic.nixosModules.default ]; nixpkgs.config.permittedInsecurePackages = [ "electron-27.3.11" ]; - programs.hyprland = { - enable = true; - }; - # use pipewire hardware.pulseaudio.enable = false; security.rtkit.enable = true; @@ -53,7 +48,10 @@ services.printing.enable = true; - services.dbus.enable = true; + services.dbus = { + enable = true; + packages = [pkgs.gcr]; + }; programs.light.enable = true; programs.dconf.enable = true;