diff --git a/flake.lock b/flake.lock index 7404d56..58dbbbf 100644 --- a/flake.lock +++ b/flake.lock @@ -5,11 +5,11 @@ "fromYaml": "fromYaml" }, "locked": { - "lastModified": 1689633990, - "narHash": "sha256-iwvQg2Vx0IIDWZaKo8Xmzxlv1YPHg+Kp/QSv8dRv0RY=", + "lastModified": 1708890466, + "narHash": "sha256-LlrC09LoPi8OPYOGPXegD72v+//VapgAqhbOFS3i8sc=", "owner": "SenchoPens", "repo": "base16.nix", - "rev": "dddf2e1c04845d43c89a8e9e37d574519649a404", + "rev": "665b3c6748534eb766c777298721cece9453fdae", "type": "github" }, "original": { @@ -150,11 +150,11 @@ "firefox-gnome-theme": { "flake": false, "locked": { - "lastModified": 1707094435, - "narHash": "sha256-QZk/qZQVt1X53peCqB2qmWhpA3xtAVgY95pebSKaTFU=", + "lastModified": 1711290399, + "narHash": "sha256-e1xuHAHgeC8EU7cAIa3XfvzgI4Y7rzyTkAt9sBsgrfc=", "owner": "rafaelmardojai", "repo": "firefox-gnome-theme", - "rev": "d7db6e546d13de55fd70dc3204bd99195eb004c4", + "rev": "33015314c12190230295cff61ced148e0f7ffe1c", "type": "github" }, "original": { @@ -184,11 +184,11 @@ "nixpkgs-lib": "nixpkgs-lib" }, "locked": { - "lastModified": 1706830856, - "narHash": "sha256-a0NYyp+h9hlb7ddVz4LUn1vT/PLwqfrWYcHMvFB1xYg=", + "lastModified": 1709336216, + "narHash": "sha256-Dt/wOWeW6Sqm11Yh+2+t0dfEWxoMxGBvv3JpIocFl9E=", "owner": "hercules-ci", "repo": "flake-parts", - "rev": "b253292d9c0a5ead9bc98c4e9a26c6312e27d69f", + "rev": "f7b3c975cf067e56e7cda6cb098ebe3fb4d74ca2", "type": "github" }, "original": { @@ -235,11 +235,11 @@ "nixpkgs": "nixpkgs" }, "locked": { - "lastModified": 1707175763, - "narHash": "sha256-0MKHC6tQ4KEuM5rui6DjKZ/VNiSANB4E+DJ/+wPS1PU=", + "lastModified": 1711133180, + "narHash": "sha256-WJOahf+6115+GMl3wUfURu8fszuNeJLv9qAWFQl3Vmo=", "owner": "nix-community", "repo": "home-manager", - "rev": "f99eace7c167b8a6a0871849493b1c613d0f1b80", + "rev": "1c2c5e4cabba4c43504ef0f8cc3f3dfa284e2dbb", "type": "github" }, "original": { @@ -274,11 +274,11 @@ "nixpkgs": "nixpkgs_2" }, "locked": { - "lastModified": 1707095568, - "narHash": "sha256-6zZifK7cs9eWiC+3MQvlMsq2JeyH7hPSP0qZ6sTny68=", + "lastModified": 1711242788, + "narHash": "sha256-6m6hw6uoIIvoAMR5RLhw7kGfNu3Govof9vnPAzveUgI=", "owner": "fufexan", "repo": "nix-gaming", - "rev": "9bde4efca9e4750ed691520d68c4c6eb308015e7", + "rev": "04028200841ec3b4ce163de4d136296d03123001", "type": "github" }, "original": { @@ -289,11 +289,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1706732774, - "narHash": "sha256-hqJlyJk4MRpcItGYMF+3uHe8HvxNETWvlGtLuVpqLU0=", + "lastModified": 1710806803, + "narHash": "sha256-qrxvLS888pNJFwJdK+hf1wpRCSQcqA6W5+Ox202NDa0=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "b8b232ae7b8b144397fdb12d20f592e5e7c1a64d", + "rev": "b06025f1533a1e07b6db3e75151caa155d1c7eb3", "type": "github" }, "original": { @@ -306,11 +306,11 @@ "nixpkgs-lib": { "locked": { "dir": "lib", - "lastModified": 1706550542, - "narHash": "sha256-UcsnCG6wx++23yeER4Hg18CXWbgNpqNXcHIo5/1Y+hc=", + "lastModified": 1709237383, + "narHash": "sha256-cy6ArO4k5qTx+l5o+0mL9f5fa86tYUX3ozE1S+Txlds=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "97b17f32362e475016f942bbdfda4a4a72a8a652", + "rev": "1536926ef5621b09bba54035ae2bb6d806d72ac8", "type": "github" }, "original": { @@ -323,11 +323,11 @@ }, "nixpkgs_2": { "locked": { - "lastModified": 1706925685, - "narHash": "sha256-hVInjWMmgH4yZgA4ZtbgJM1qEAel72SYhP5nOWX4UIM=", + "lastModified": 1711200738, + "narHash": "sha256-dkJmk/ET/tRV4007O6kU101UEg1svUwiyk/zEEX9Tdg=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "79a13f1437e149dc7be2d1290c74d378dad60814", + "rev": "20bc93ca7b2158ebc99b8cef987a2173a81cde35", "type": "github" }, "original": { @@ -339,11 +339,11 @@ }, "nixpkgs_3": { "locked": { - "lastModified": 1707092692, - "narHash": "sha256-ZbHsm+mGk/izkWtT4xwwqz38fdlwu7nUUKXTOmm4SyE=", + "lastModified": 1711163522, + "narHash": "sha256-YN/Ciidm+A0fmJPWlHBGvVkcarYWSC+s3NTPk/P+q3c=", "owner": "nixos", "repo": "nixpkgs", - "rev": "faf912b086576fd1a15fca610166c98d47bc667e", + "rev": "44d0940ea560dee511026a53f0e2e2cde489b4d4", "type": "github" }, "original": { @@ -377,11 +377,11 @@ "utils": "utils" }, "locked": { - "lastModified": 1707322565, - "narHash": "sha256-yIf/7Os4ry3iCri9IRiOYipFwBuXw/Ipky59AeMkRvM=", + "lastModified": 1711459416, + "narHash": "sha256-JdfYz5xOg2RPBo4S8+ykdNBnAguoI+XhZ6g3QAXuw9k=", "owner": "wamserma", "repo": "flake-programs-sqlite", - "rev": "70ccc21c9c5cec12573ac29264e34104e6db1ba6", + "rev": "bba0e2e52c058c7dba0656f4a31e9db68eb62197", "type": "github" }, "original": { @@ -418,11 +418,11 @@ "nixpkgs": "nixpkgs_4" }, "locked": { - "lastModified": 1707311311, - "narHash": "sha256-Se80sgOhpKxlG/6mlpezHSJjGBDzO3X0SQTn9eL2j7o=", + "lastModified": 1711224130, + "narHash": "sha256-RyOvyQASi5lvKLH5ISiGGkdX1eJxYF25aQALGfN9U0k=", "owner": "danth", "repo": "stylix", - "rev": "9942fca8707efbd8c3f6108549f098462425d1b3", + "rev": "53d3e5d5b36a5227b906e00d7e884dcfb7852403", "type": "github" }, "original": { diff --git a/flake.nix b/flake.nix index e4de62b..bcf577d 100755 --- a/flake.nix +++ b/flake.nix @@ -28,12 +28,16 @@ opt = nixpkgs.lib.optionals; dirFiles = dir: map (file: "${dir}/${file}") (builtins.attrNames (builtins.readDir dir)); }; + nixpkgs-teams = import inputs.nixpkgs-teams { + system = "x86_64-linux"; + config.allowUnfree = true; + }; system = hostname: isDesktop: with dirUtils; nixpkgs.lib.nixosSystem { system = "x86_64-linux"; specialArgs = { - inherit inputs self isDesktop dirUtils; + inherit inputs self isDesktop dirUtils nixpkgs-teams; }; modules = diff --git a/home-manager/vscode.nix b/home-manager/vscode.nix index ef65814..5458d6c 100755 --- a/home-manager/vscode.nix +++ b/home-manager/vscode.nix @@ -33,7 +33,7 @@ command = "-workbench.action.files.save"; } ]; - + userSettings = lib.mkForce { "editor.guides.bracketPairs" = "active"; "window.dialogStyle" = "custom"; diff --git a/modules/common-desktop/bin.nix b/modules/common-desktop/bin.nix index bcb1013..fce3166 100644 --- a/modules/common-desktop/bin.nix +++ b/modules/common-desktop/bin.nix @@ -1 +1 @@ -{environment.localBinInPath = true;} \ No newline at end of file +{environment.localBinInPath = true;} diff --git a/modules/common-desktop/flatpak.nix b/modules/common-desktop/flatpak.nix index d1b6cd8..1ff0c53 100644 --- a/modules/common-desktop/flatpak.nix +++ b/modules/common-desktop/flatpak.nix @@ -1,3 +1,3 @@ { - services.flatpak.enable = true; + services.flatpak.enable = true; } diff --git a/modules/common-desktop/gnome.nix b/modules/common-desktop/gnome.nix index 81864e3..5a97dd0 100644 --- a/modules/common-desktop/gnome.nix +++ b/modules/common-desktop/gnome.nix @@ -1,9 +1,9 @@ {pkgs, ...}: { environment.systemPackages = with pkgs.gnomeExtensions; [ + open-bar caffeine pop-shell appindicator - search-light blur-my-shell just-perfection burn-my-windows diff --git a/modules/common-desktop/polkit.nix b/modules/common-desktop/polkit.nix index 02c590a..5733ab2 100644 --- a/modules/common-desktop/polkit.nix +++ b/modules/common-desktop/polkit.nix @@ -1,20 +1,20 @@ {pkgs, ...}: { environment.systemPackages = [ (pkgs.writeTextDir "share/polkit-1/actions/com.henryhiles.quados.policy" '' - + - - - Rebuild - Authentication is required to rebuild the system - - auth_admin_keep - auth_admin_keep - auth_admin_keep - - /run/current-system/sw/bin/flatpak - - - '') + + + Rebuild + Authentication is required to rebuild the system + + auth_admin_keep + auth_admin_keep + auth_admin_keep + + /run/current-system/sw/bin/flatpak + + + '') ]; -} \ No newline at end of file +} diff --git a/modules/common-desktop/steam.nix b/modules/common-desktop/steam.nix index 8907823..bf74191 100644 --- a/modules/common-desktop/steam.nix +++ b/modules/common-desktop/steam.nix @@ -5,8 +5,6 @@ }: { programs.steam = { enable = true; - package = pkgs.steam.override { - extraProfile = "export STEAM_EXTRA_COMPAT_TOOLS_PATHS='${inputs.nix-gaming.packages.${pkgs.system}.proton-ge}'"; - }; + extraCompatPackages = [pkgs.proton-ge-bin]; }; } diff --git a/quadraticpc/hardware-configuration.nix b/quadraticpc/hardware-configuration.nix index 38df178..eebf467 100644 --- a/quadraticpc/hardware-configuration.nix +++ b/quadraticpc/hardware-configuration.nix @@ -1,29 +1,33 @@ # 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") - ]; + config, + lib, + pkgs, + modulesPath, + ... +}: { + imports = [ + (modulesPath + "/installer/scan/not-detected.nix") + ]; - boot.initrd.availableKernelModules = [ "nvme" "xhci_pci" "ahci" "usb_storage" "usbhid" "sd_mod" ]; - boot.initrd.kernelModules = [ ]; - boot.kernelModules = [ "kvm-amd" ]; - boot.extraModulePackages = [ ]; + boot.initrd.availableKernelModules = ["nvme" "xhci_pci" "ahci" "usb_storage" "usbhid" "sd_mod"]; + boot.initrd.kernelModules = []; + boot.kernelModules = ["kvm-amd"]; + boot.extraModulePackages = []; - fileSystems."/" = - { device = "/dev/disk/by-uuid/7d01741d-d58f-49d4-b3a2-4d37d953873d"; - fsType = "ext4"; - }; + fileSystems."/" = { + device = "/dev/disk/by-uuid/7d01741d-d58f-49d4-b3a2-4d37d953873d"; + fsType = "ext4"; + }; - fileSystems."/boot" = - { device = "/dev/disk/by-uuid/E841-063C"; - fsType = "vfat"; - }; + fileSystems."/boot" = { + device = "/dev/disk/by-uuid/E841-063C"; + fsType = "vfat"; + }; - swapDevices = [ ]; + swapDevices = []; # 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 diff --git a/stylix.nix b/stylix.nix index 495e0d8..b673fe3 100755 --- a/stylix.nix +++ b/stylix.nix @@ -3,12 +3,10 @@ polarity = "dark"; image = ./background.jpg; base16Scheme = "${pkgs.base16-schemes}/share/themes/nord.yaml"; - targets.plymouth.blackBackground = false; cursor = { name = "GoogleDot-Blue"; package = pkgs.google-cursor; - size = 24; }; fonts = {