diff --git a/flake.lock b/flake.lock index cd79104..766151f 100644 --- a/flake.lock +++ b/flake.lock @@ -52,11 +52,11 @@ ] }, "locked": { - "lastModified": 1708564520, - "narHash": "sha256-juduDTYBhGN6jNfQ5RMDpbQF+MkO0pj3k7XGDSTjAbs=", + "lastModified": 1709773529, + "narHash": "sha256-CNz9ybeR88j8QQxy7YNFa8RlNq3pWnXLvocWIt2n5Mg=", "owner": "nix-community", "repo": "disko", - "rev": "23d308f0059955e3719efc81a34d1fc0369fbb74", + "rev": "a2009bc2b4e1d3ff5360048292deb0d610aa064b", "type": "github" }, "original": { @@ -74,11 +74,11 @@ }, "locked": { "dir": "pkgs/firefox-addons", - "lastModified": 1708597410, - "narHash": "sha256-LxT/wn47mSiPzkctRRoZ/pWoBY2fT3ftile+k2yBz58=", + "lastModified": 1709784245, + "narHash": "sha256-t1sobS2zj7hD/dZj9aVPipYnskrk+Q7FqAViSqEMLQU=", "owner": "rycee", "repo": "nur-expressions", - "rev": "3662415f8a026cacd746e0699c51f3ecadfb17a9", + "rev": "673c3faea3a5239f4efe545c4649c2b68501dbe1", "type": "gitlab" }, "original": { @@ -149,27 +149,27 @@ ] }, "locked": { - "lastModified": 1702195668, - "narHash": "sha256-Lxmjez0nfNBptdqV5GsXKm7Bb7swjGsrxiLxWJu0tL8=", + "lastModified": 1706981411, + "narHash": "sha256-cLbLPTL1CDmETVh4p0nQtvoF+FSEjsnJTFpTxhXywhQ=", "owner": "nix-community", "repo": "home-manager", - "rev": "33110fb3c7fe6a94b98b641866a5eddb64b7c23f", + "rev": "652fda4ca6dafeb090943422c34ae9145787af37", "type": "github" }, "original": { "owner": "nix-community", - "ref": "release-23.05", + "ref": "release-23.11", "repo": "home-manager", "type": "github" } }, "impermanence": { "locked": { - "lastModified": 1706639736, - "narHash": "sha256-CaG4j9+UwBDfinxxvJMo6yOonSmSo0ZgnbD7aj2Put0=", + "lastModified": 1708968331, + "narHash": "sha256-VUXLaPusCBvwM3zhGbRIJVeYluh2uWuqtj4WirQ1L9Y=", "owner": "nix-community", "repo": "impermanence", - "rev": "cd13c2917eaa68e4c49fea0ff9cada45440d7045", + "rev": "a33ef102a02ce77d3e39c25197664b7a636f9c30", "type": "github" }, "original": { @@ -185,11 +185,11 @@ ] }, "locked": { - "lastModified": 1708335499, - "narHash": "sha256-ZOAhp3hiJsWdNDSs/SF2EPylluAx5PiZv9aAUwZrKOI=", + "lastModified": 1709714234, + "narHash": "sha256-fnuVQqdK48c66EC4mL8t7uLhwsY6JDyn7H5tjRpx9Sg=", "owner": "viperml", "repo": "nh", - "rev": "aa4df097654cdeb15aa74aabd72863a6fb30c7e6", + "rev": "3f148b0c7f2d56be65dc55628f6b2e68ee10e231", "type": "github" }, "original": { @@ -222,11 +222,11 @@ }, "nixos-hardware": { "locked": { - "lastModified": 1708594753, - "narHash": "sha256-c/gH7iXS/IYH9NrFOT+aJqTq+iEBkvAkpWuUHGU3+f0=", + "lastModified": 1709410583, + "narHash": "sha256-esOSUoQ7mblwcsSea0K17McZuwAIjoS6dq/4b83+lvw=", "owner": "nixos", "repo": "nixos-hardware", - "rev": "3f7d0bca003eac1a1a7f4659bbab9c8f8c2a0958", + "rev": "59e37017b9ed31dee303dbbd4531c594df95cfbc", "type": "github" }, "original": { @@ -238,27 +238,27 @@ }, "nixpkgs": { "locked": { - "lastModified": 1704290814, - "narHash": "sha256-LWvKHp7kGxk/GEtlrGYV68qIvPHkU9iToomNFGagixU=", + "lastModified": 1709677081, + "narHash": "sha256-tix36Y7u0rkn6mTm0lA45b45oab2cFLqAzDbJxeXS+c=", "owner": "nixos", "repo": "nixpkgs", - "rev": "70bdadeb94ffc8806c0570eb5c2695ad29f0e421", + "rev": "880992dcc006a5e00dd0591446fdf723e6a51a64", "type": "github" }, "original": { "owner": "nixos", - "ref": "nixos-23.05", + "ref": "nixos-23.11", "repo": "nixpkgs", "type": "github" } }, "nixpkgs-unstable": { "locked": { - "lastModified": 1708475490, - "narHash": "sha256-g1v0TsWBQPX97ziznfJdWhgMyMGtoBFs102xSYO4syU=", + "lastModified": 1709703039, + "narHash": "sha256-6hqgQ8OK6gsMu1VtcGKBxKQInRLHtzulDo9Z5jxHEFY=", "owner": "nixos", "repo": "nixpkgs", - "rev": "0e74ca98a74bc7270d28838369593635a5db3260", + "rev": "9df3e30ce24fd28c7b3e2de0d986769db5d6225d", "type": "github" }, "original": { @@ -326,11 +326,11 @@ ] }, "locked": { - "lastModified": 1708500294, - "narHash": "sha256-mvJIecY3tDKZh7297mqOtOuAvP7U1rqjfLNfmfkjFpU=", + "lastModified": 1709711091, + "narHash": "sha256-L0rSIU9IguTG4YqSj4B/02SyTEz55ACq5t8gXpzteYc=", "owner": "mic92", "repo": "sops-nix", - "rev": "f6b80ab6cd25e57f297fe466ad689d8a77057c11", + "rev": "25dd60fdd08fcacee2567a26ba6b91fe098941dc", "type": "github" }, "original": { @@ -377,11 +377,11 @@ ] }, "locked": { - "lastModified": 1684517665, - "narHash": "sha256-SaAr66uCQ8CF75jIr23FZjk1+9Kfwm5sQnwV25206Gs=", + "lastModified": 1709622318, + "narHash": "sha256-bTscF0366xtoIXgH7Zq+Mn0mpX3w4h/2xKpHiYMyLNc=", "owner": "nix-community", "repo": "nixos-vscode-server", - "rev": "1e1358493df6529d4c7bc4cc3066f76fd16d4ae6", + "rev": "d0ed9b8cf1f0a71f110df9119489ab047e0726bd", "type": "github" }, "original": { diff --git a/flake.nix b/flake.nix index 55b932e..6817052 100644 --- a/flake.nix +++ b/flake.nix @@ -2,7 +2,7 @@ description = "Greg Burd's NixOS and Home Manager Configuration"; inputs = { - nixpkgs.url = "github:nixos/nixpkgs/nixos-23.05"; + nixpkgs.url = "github:nixos/nixpkgs/nixos-23.11"; # You can access packages and modules from different nixpkgs revs at the # same time. See 'unstable-packages' overlay in 'overlays/default.nix'. nixpkgs-unstable.url = "github:nixos/nixpkgs/nixos-unstable"; @@ -15,7 +15,7 @@ #fh.url = "https://flakehub.com/f/DeterminateSystems/fh/*.tar.gz"; - home-manager.url = "github:nix-community/home-manager/release-23.05"; + home-manager.url = "github:nix-community/home-manager/release-23.11"; home-manager.inputs.nixpkgs.follows = "nixpkgs"; nixos-hardware.url = "github:nixos/nixos-hardware/master"; @@ -48,7 +48,7 @@ let inherit (self) outputs; # https://nixos.wiki/wiki/FAQ/When_do_I_update_stateVersion - stateVersion = "23.05"; + stateVersion = "23.11"; libx = import ./lib { inherit inputs outputs stateVersion; }; in { diff --git a/nixos/_mixins/desktop/obs-studio.nix b/nixos/_mixins/desktop/obs-studio.nix index 05da591..24548db 100644 --- a/nixos/_mixins/desktop/obs-studio.nix +++ b/nixos/_mixins/desktop/obs-studio.nix @@ -19,7 +19,7 @@ obs-rgb-levels-filter obs-text-pthread obs-scale-to-sound - advanced-scene-switcher + # TODO: advanced-scene-switcher https://github.com/NixOS/nixpkgs/issues/287254 obs-shaderfilter obs-source-clone obs-source-record diff --git a/nixos/_mixins/services/bluetooth.nix b/nixos/_mixins/services/bluetooth.nix index 429c29a..2ba3193 100644 --- a/nixos/_mixins/services/bluetooth.nix +++ b/nixos/_mixins/services/bluetooth.nix @@ -3,7 +3,7 @@ # https://nixos.wiki/wiki/Bluetooth hardware.bluetooth = { enable = true; - package = pkgs.bluezFull; + package = pkgs.bluez; settings = { General = { Enable = "Source,Sink,Media,Socket"; diff --git a/nixos/default.nix b/nixos/default.nix index db7c64b..d3e20f2 100644 --- a/nixos/default.nix +++ b/nixos/default.nix @@ -112,7 +112,7 @@ in fonts = { fontDir.enable = true; - fonts = with pkgs; [ + packages = with pkgs; [ (nerdfonts.override { fonts = [ "FiraCode" "SourceCodePro" "UbuntuMono" ]; }) fira fira-go @@ -125,7 +125,7 @@ in ]; # Enable a basic set of fonts providing several font styles and families and reasonable coverage of Unicode. - enableDefaultFonts = false; + enableDefaultPackages = false; fontconfig = { antialias = true; @@ -139,7 +139,7 @@ in hinting = { autohint = false; enable = true; - style = "hintslight"; + style = "slight"; }; subpixel = { rgba = "rgb"; diff --git a/shells/code-format/flake.nix b/shells/code-format/flake.nix index a832779..60145db 100644 --- a/shells/code-format/flake.nix +++ b/shells/code-format/flake.nix @@ -2,7 +2,7 @@ description = "Nix shell for code-format tools"; inputs = { - nixpkgs.url = "github:NixOS/nixpkgs/release-23.05"; + nixpkgs.url = "github:NixOS/nixpkgs/release-23.11"; flake-utils.url = "github:numtide/flake-utils"; }; diff --git a/shells/gpu/flake.nix b/shells/gpu/flake.nix index f4e0f0a..b1459fb 100644 --- a/shells/gpu/flake.nix +++ b/shells/gpu/flake.nix @@ -2,7 +2,7 @@ description = "Nix shell for GPU tools"; inputs = { - nixpkgs.url = "github:NixOS/nixpkgs/release-23.05"; + nixpkgs.url = "github:NixOS/nixpkgs/release-23.11"; flake-utils.url = "github:numtide/flake-utils"; }; diff --git a/shells/network/flake.nix b/shells/network/flake.nix index f36f7d8..ac6fc10 100644 --- a/shells/network/flake.nix +++ b/shells/network/flake.nix @@ -2,7 +2,7 @@ description = "Nix shell for network tools"; inputs = { - nixpkgs.url = "github:NixOS/nixpkgs/release-23.05"; + nixpkgs.url = "github:NixOS/nixpkgs/release-23.11"; flake-utils.url = "github:numtide/flake-utils"; };