From 3e9811007bd4290d12ce6abf8a25681f5179853e Mon Sep 17 00:00:00 2001 From: "Agatha V. Lovelace" Date: Thu, 1 Jun 2023 19:07:54 +0200 Subject: [PATCH] NixOS 23.05 update --- common/default.nix | 9 +- common/fragments/frq-friend.nix | 1 + common/fragments/graphical/bspwm.nix | 7 +- common/fragments/graphical/default.nix | 27 +-- common/fragments/graphical/kitty.nix | 4 +- common/fragments/graphical/spotify.nix | 10 + common/home_manager/helix.nix | 12 +- common/pkgs/bin.nix | 4 +- flake.lock | 252 ++++++++++++++++--------- flake.nix | 10 +- hosts/bloodletting/configuration.nix | 5 +- hosts/ritual/configuration.nix | 10 +- 12 files changed, 217 insertions(+), 134 deletions(-) create mode 100644 common/fragments/graphical/spotify.nix diff --git a/common/default.nix b/common/default.nix index 65cd77d..9a6fb78 100644 --- a/common/default.nix +++ b/common/default.nix @@ -4,7 +4,7 @@ ## Optimizations # Clean /tmp - boot.cleanTmpDir = true; + boot.tmp.cleanOnBoot = true; # Link identical files nix.settings.auto-optimise-store = true; @@ -42,13 +42,14 @@ # Packages used on all systems environment.systemPackages = with pkgs; [ + comma git - wget - xclip killall + openssl rsync sqlite-interactive - openssl + wget + xclip ]; # 🥺 diff --git a/common/fragments/frq-friend.nix b/common/fragments/frq-friend.nix index 529b895..2ceee70 100644 --- a/common/fragments/frq-friend.nix +++ b/common/fragments/frq-friend.nix @@ -22,6 +22,7 @@ in { ExecStart = "${pkgs.frq-friend}/bin/f3"; WorkingDirectory = path; Restart = "always"; + RuntimeMaxSec = "1h"; }; preStart = '' ln -sf ${config} ${path}/config.kdl diff --git a/common/fragments/graphical/bspwm.nix b/common/fragments/graphical/bspwm.nix index 6d3e2a7..bc073ec 100644 --- a/common/fragments/graphical/bspwm.nix +++ b/common/fragments/graphical/bspwm.nix @@ -4,7 +4,7 @@ enable = true; extraConfigEarly = lib.strings.concatStringsSep "\n" [ "xsetroot -cursor_name left_ptr" - "xinput set-prop 'SynPS/2 Synaptics TouchPad' 'Synaptics Scrolling Distance' 60 60" + "xinput set-prop 'SynPS/2 Synaptics TouchPad' 'libinput Scrolling Pixel Distance' 10" "setxkbmap" ]; extraConfig = lib.strings.concatStringsSep "\n" @@ -33,7 +33,8 @@ }; "Element".desktop = "II"; "TelegramDesktop".desktop = "III"; - "Geary".desktop = "IV"; + "Spotify".desktop = "IV"; + "Geary".desktop = "V"; "firefox" = { desktop = "I"; state = "tiled"; @@ -43,7 +44,7 @@ "firefox:Places".state = "floating"; }; startupPrograms = - [ "firefox" "element-desktop" "telegram-desktop" "geary" ]; + [ "firefox" "element-desktop" "telegram-desktop" "spotify" "geary" ]; }; services.sxhkd = { diff --git a/common/fragments/graphical/default.nix b/common/fragments/graphical/default.nix index 35b8ee0..d5a184e 100644 --- a/common/fragments/graphical/default.nix +++ b/common/fragments/graphical/default.nix @@ -10,12 +10,15 @@ ./kitty.nix ./element.nix ./url-eater.nix + ./spotify.nix ]; # User packages users.users.agatha.packages = with pkgs; [ + blueberry brightnessctl broot + clipmenu colmena element-desktop flameshot @@ -32,20 +35,19 @@ lxappearance magic-wormhole neofetch + nil nitrogen + obs-studio pfetch pridefetch + prismlauncher rofi-calc rofimoji tdesktop wireguard-tools xdg-utils - yubioath-desktop - clipmenu xdotool - prismlauncher - obs-studio - nil + yubioath-flutter ]; # Brightness/volume keys @@ -75,20 +77,7 @@ layout = lib.mkForce "eu,de(qwerty),ua,ru"; xkbOptions = "ctrl:nocaps,compose:rctrl"; - synaptics = { - enable = true; - - tapButtons = true; - vertTwoFingerScroll = true; - vertEdgeScroll = true; - - horizEdgeScroll = true; - horizTwoFingerScroll = true; - - palmDetect = true; - palmMinWidth = 8; - palmMinZ = 100; - }; + libinput.enable = true; }; home-manager.users.agatha = { diff --git a/common/fragments/graphical/kitty.nix b/common/fragments/graphical/kitty.nix index 8f86efb..d95c41b 100644 --- a/common/fragments/graphical/kitty.nix +++ b/common/fragments/graphical/kitty.nix @@ -9,9 +9,7 @@ in { font = { package = pkgs.iosevka; name = "Iosevka Gothic"; - # Has to be an integer until https://github.com/nix-community/home-manager/commit/e56714a057ecfa8b89caeccc23e32c628874ad4a is in 22.11 - # size = 11.5; - size = 12; + size = 11.5; }; keybindings = { "f5" = "load_config_file"; }; diff --git a/common/fragments/graphical/spotify.nix b/common/fragments/graphical/spotify.nix new file mode 100644 index 0000000..a9a0d29 --- /dev/null +++ b/common/fragments/graphical/spotify.nix @@ -0,0 +1,10 @@ +{ pkgs, lib, ... }: { + programs.spicetify = { + enable = true; + + enabledCustomApps = with pkgs.spicetify-pkgs.apps; [ + marketplace + lyrics-plus + ]; + }; +} diff --git a/common/home_manager/helix.nix b/common/home_manager/helix.nix index a707fe3..910c7ce 100644 --- a/common/home_manager/helix.nix +++ b/common/home_manager/helix.nix @@ -7,11 +7,13 @@ helix = { enable = true; package = pkgs.helix; - languages = [{ - name = "nix"; - auto-format = true; - formatter = { command = "nixfmt"; }; - }]; + languages = { + language = [{ + name = "nix"; + auto-format = true; + formatter = { command = "nixfmt"; }; + }]; + }; settings = { theme = "paramount-dark"; editor = { diff --git a/common/pkgs/bin.nix b/common/pkgs/bin.nix index bf4877d..d75528b 100644 --- a/common/pkgs/bin.nix +++ b/common/pkgs/bin.nix @@ -1,4 +1,4 @@ -{ rustPlatform, fetchFromGitHub }: +{ rustPlatform, fetchFromGitHub, git }: rustPlatform.buildRustPackage rec { pname = "bin"; @@ -13,6 +13,8 @@ rustPlatform.buildRustPackage rec { cargoLock = { lockFile = "${src}/Cargo.lock"; }; + nativeBuildInputs = [ git ]; + meta = { description = "highly opinionated, minimal pastebin"; homepage = "https://github.com/WantGuns/bin"; diff --git a/flake.lock b/flake.lock index 41fa37a..a5b6678 100644 --- a/flake.lock +++ b/flake.lock @@ -8,11 +8,11 @@ "stable": "stable" }, "locked": { - "lastModified": 1681413750, - "narHash": "sha256-mouot7Dk89BeFBAI8rn5DnuKGreHzQZ+AI/cmYpeHig=", + "lastModified": 1685370160, + "narHash": "sha256-7EAZtvHZBN4CFbUWznQicGL/g2+A/9w5JUl88xWmxkI=", "owner": "AgathaSorceress", "repo": "colmena", - "rev": "e4cc19580cb07fdd3be263a8e01a04adbc4e8949", + "rev": "f279530ba0ca33f30fc3ae386ae5487e8d926460", "type": "github" }, "original": { @@ -44,15 +44,16 @@ "crane": { "flake": false, "locked": { - "lastModified": 1670900067, - "narHash": "sha256-VXVa+KBfukhmWizaiGiHRVX/fuk66P8dgSFfkVN4/MY=", + "lastModified": 1681175776, + "narHash": "sha256-7SsUy9114fryHAZ8p1L6G6YSu7jjz55FddEwa2U8XZc=", "owner": "ipetkov", "repo": "crane", - "rev": "59b31b41a589c0a65e4a1f86b0e5eac68081468b", + "rev": "445a3d222947632b5593112bb817850e8a9cf737", "type": "github" }, "original": { "owner": "ipetkov", + "ref": "v0.12.1", "repo": "crane", "type": "github" } @@ -115,11 +116,11 @@ ] }, "locked": { - "lastModified": 1680258209, - "narHash": "sha256-lEo50RXI/17/a9aCIun8Hz62ZJ5JM5RGeTgclIP+Lgc=", + "lastModified": 1683212002, + "narHash": "sha256-EObtqyQsv9v+inieRY5cvyCMCUI5zuU5qu+1axlJCPM=", "owner": "nix-community", "repo": "dream2nix", - "rev": "6f512b5a220fdb26bd3c659f7b55e4f052ec8b35", + "rev": "fbfb09d2ab5ff761d822dd40b4a1def81651d096", "type": "github" }, "original": { @@ -150,11 +151,11 @@ ] }, "locked": { - "lastModified": 1680172861, - "narHash": "sha256-QMyI338xRxaHFDlCXdLCtgelGQX2PdlagZALky4ZXJ8=", + "lastModified": 1680698112, + "narHash": "sha256-FgnobN/DvCjEsc0UAZEAdPLkL4IZi2ZMnu2K2bUaElc=", "owner": "davhau", "repo": "drv-parts", - "rev": "ced8a52f62b0a94244713df2225c05c85b416110", + "rev": "e8c2ec1157dc1edb002989669a0dbd935f430201", "type": "github" }, "original": { @@ -227,12 +228,15 @@ } }, "flake-utils_2": { + "inputs": { + "systems": "systems_3" + }, "locked": { - "lastModified": 1659877975, - "narHash": "sha256-zllb8aq3YO3h8B/U0/J1WBgAL8EX5yWf5pMj3G0NAmc=", + "lastModified": 1681202837, + "narHash": "sha256-H+Rh19JDwRtpVPAWp64F+rlEtxUWBAQW28eAi3SRSzg=", "owner": "numtide", "repo": "flake-utils", - "rev": "c0e246b9b83f637f4681389ecabcb2681b4f3af0", + "rev": "cfacdce06f30d2b68473a46042957675eebb3401", "type": "github" }, "original": { @@ -256,6 +260,24 @@ "type": "github" } }, + "flake-utils_4": { + "inputs": { + "systems": "systems_4" + }, + "locked": { + "lastModified": 1681202837, + "narHash": "sha256-H+Rh19JDwRtpVPAWp64F+rlEtxUWBAQW28eAi3SRSzg=", + "owner": "numtide", + "repo": "flake-utils", + "rev": "cfacdce06f30d2b68473a46042957675eebb3401", + "type": "github" + }, + "original": { + "owner": "numtide", + "repo": "flake-utils", + "type": "github" + } + }, "frq-friend": { "inputs": { "naersk": "naersk_2", @@ -284,11 +306,11 @@ "rust-overlay": "rust-overlay" }, "locked": { - "lastModified": 1682990279, - "narHash": "sha256-ooWLgZItK9clTqe5WgdewIWkW0L4T1zuhhGNwePPvW8=", + "lastModified": 1685487437, + "narHash": "sha256-hxcl/seMmFtFhr2Nv/bBEEVgcFSyrvE2MLMtQJtG9nM=", "owner": "helix-editor", "repo": "helix", - "rev": "d1a4bd876b3ae646693c0905d7f29b636e2e5033", + "rev": "d511122279b3b479362830305f4812f096273b6a", "type": "github" }, "original": { @@ -301,20 +323,19 @@ "inputs": { "nixpkgs": [ "nixpkgs" - ], - "utils": "utils_3" + ] }, "locked": { - "lastModified": 1681092193, - "narHash": "sha256-JerCqqOqbT2tBnXQW4EqwFl0hHnuZp21rIQ6lu/N4rI=", + "lastModified": 1685599623, + "narHash": "sha256-Tob4CMOVHue0D3RzguDBCtUmX5ji2PsdbQDbIOIKvsc=", "owner": "nix-community", "repo": "home-manager", - "rev": "f9edbedaf015013eb35f8caacbe0c9666bbc16af", + "rev": "93db05480c0c0f30382d3e80779e8386dcb4f9dd", "type": "github" }, "original": { "owner": "nix-community", - "ref": "release-22.11", + "ref": "release-23.05", "repo": "home-manager", "type": "github" } @@ -338,11 +359,11 @@ "mk-naked-shell": { "flake": false, "locked": { - "lastModified": 1676572903, - "narHash": "sha256-oQoDHHUTxNVSURfkFcYLuAK+btjs30T4rbEUtCUyKy8=", + "lastModified": 1681286841, + "narHash": "sha256-3XlJrwlR0nBiREnuogoa5i1b4+w/XPe0z8bbrJASw0g=", "owner": "yusdacra", "repo": "mk-naked-shell", - "rev": "aeca9f8aa592f5e8f71f407d081cb26fd30c5a57", + "rev": "7612f828dd6f22b7fb332cc69440e839d7ffe6bd", "type": "github" }, "original": { @@ -414,7 +435,7 @@ }, "naersk_3": { "inputs": { - "nixpkgs": "nixpkgs_9" + "nixpkgs": "nixpkgs_10" }, "locked": { "lastModified": 1679567394, @@ -446,11 +467,11 @@ ] }, "locked": { - "lastModified": 1680329418, - "narHash": "sha256-+KN0eQLSZvL1J0kDO8/fxv0UCHTyZCADLmpIfeeiSGo=", + "lastModified": 1683699050, + "narHash": "sha256-UWKQpzVcSshB+sU2O8CCHjOSTQrNS7Kk9V3+UeBsJpg=", "owner": "yusdacra", "repo": "nix-cargo-integration", - "rev": "98c1d2ff5155f0fee5d290f6b982cb990839d540", + "rev": "ed27173cd1b223f598343ea3c15aacb1d140feac", "type": "github" }, "original": { @@ -481,11 +502,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1674641431, - "narHash": "sha256-qfo19qVZBP4qn5M5gXc/h1MDgAtPA5VxJm9s8RUAkVk=", + "lastModified": 1683408522, + "narHash": "sha256-9kcPh6Uxo17a3kK3XCHhcWiV1Yu1kYj22RHiymUhMkU=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "9b97ad7b4330aacda9b2343396eb3df8a853b4fc", + "rev": "897876e4c484f1e8f92009fd11b7d988a121a4e7", "type": "github" }, "original": { @@ -498,11 +519,11 @@ "nixpkgs-lib": { "locked": { "dir": "lib", - "lastModified": 1678375444, - "narHash": "sha256-XIgHfGvjFvZQ8hrkfocanCDxMefc/77rXeHvYdzBMc8=", + "lastModified": 1682879489, + "narHash": "sha256-sASwo8gBt7JDnOOstnps90K1wxmVfyhsTPPNTGBPjjg=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "130fa0baaa2b93ec45523fdcde942f6844ee9f6e", + "rev": "da45bf6ec7bbcc5d1e14d3795c025199f28e0de0", "type": "github" }, "original": { @@ -531,11 +552,11 @@ }, "nixpkgs-unstable": { "locked": { - "lastModified": 1682960002, - "narHash": "sha256-5Zjh4pT3lAjFGN1gVrjqj1LLJHKCAlGdLD8raU7oEMc=", + "lastModified": 1685561376, + "narHash": "sha256-uIcJdaovXr55FJdmvR6yIN6IWoOL4amBj56e/T2KhgM=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "8670e496ffd093b60e74e7fa53526aa5920d09eb", + "rev": "bc3ec5eaa759d58e9fb1bdc9cfe94f74d0331b31", "type": "github" }, "original": { @@ -560,6 +581,20 @@ } }, "nixpkgs_10": { + "locked": { + "lastModified": 1680273054, + "narHash": "sha256-Bs6/5LpvYp379qVqGt9mXxxx9GSE789k3oFc+OAL07M=", + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "3364b5b117f65fe1ce65a3cdd5612a078a3b31e3", + "type": "github" + }, + "original": { + "id": "nixpkgs", + "type": "indirect" + } + }, + "nixpkgs_11": { "locked": { "lastModified": 1680273054, "narHash": "sha256-Bs6/5LpvYp379qVqGt9mXxxx9GSE789k3oFc+OAL07M=", @@ -575,7 +610,7 @@ "type": "github" } }, - "nixpkgs_11": { + "nixpkgs_12": { "locked": { "lastModified": 1682092588, "narHash": "sha256-NjKBPnScpbGiH/YOx74DIFOVkr5AKJOVZoy0l7J58gk=", @@ -653,11 +688,11 @@ }, "nixpkgs_6": { "locked": { - "lastModified": 1680213900, - "narHash": "sha256-cIDr5WZIj3EkKyCgj/6j3HBH4Jj1W296z7HTcWj1aMA=", + "lastModified": 1683408522, + "narHash": "sha256-9kcPh6Uxo17a3kK3XCHhcWiV1Yu1kYj22RHiymUhMkU=", "owner": "nixos", "repo": "nixpkgs", - "rev": "e3652e0735fbec227f342712f180f4f21f0594f2", + "rev": "897876e4c484f1e8f92009fd11b7d988a121a4e7", "type": "github" }, "original": { @@ -685,31 +720,33 @@ }, "nixpkgs_8": { "locked": { - "lastModified": 1682931856, - "narHash": "sha256-phFRasoX9a7pPwfHwUO4A3HjccedEgVQLHR1UoPCY90=", + "lastModified": 1685533922, + "narHash": "sha256-y4FCQpYafMQ42l1V+NUrMel9RtFtZo59PzdzflKR/lo=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "d529862de0cdabaebac67a48d825af99c2c3b50d", + "rev": "3a70dd92993182f8e514700ccf5b1ae9fc8a3b8d", "type": "github" }, "original": { "id": "nixpkgs", - "ref": "nixos-22.11", + "ref": "nixos-23.05", "type": "indirect" } }, "nixpkgs_9": { "locked": { - "lastModified": 1680273054, - "narHash": "sha256-Bs6/5LpvYp379qVqGt9mXxxx9GSE789k3oFc+OAL07M=", + "lastModified": 1684385584, + "narHash": "sha256-O7y0gK8OLIDqz+LaHJJyeu09IGiXlZIS3+JgEzGmmJA=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "3364b5b117f65fe1ce65a3cdd5612a078a3b31e3", + "rev": "48a0fb7aab511df92a17cf239c37f2bd2ec9ae3a", "type": "github" }, "original": { - "id": "nixpkgs", - "type": "indirect" + "owner": "NixOS", + "ref": "nixos-unstable", + "repo": "nixpkgs", + "type": "github" } }, "parts": { @@ -721,11 +758,11 @@ ] }, "locked": { - "lastModified": 1679737941, - "narHash": "sha256-srSD9CwsVPnUMsIZ7Kt/UegkKUEBcTyU1Rev7mO45S0=", + "lastModified": 1683560683, + "narHash": "sha256-XAygPMN5Xnk/W2c1aW0jyEa6lfMDZWlQgiNtmHXytPc=", "owner": "hercules-ci", "repo": "flake-parts", - "rev": "3502ee99d6dade045bdeaf7b0cd8ec703484c25c", + "rev": "006c75898cf814ef9497252b022e91c946ba8e17", "type": "github" }, "original": { @@ -739,11 +776,11 @@ "nixpkgs-lib": "nixpkgs-lib" }, "locked": { - "lastModified": 1679737941, - "narHash": "sha256-srSD9CwsVPnUMsIZ7Kt/UegkKUEBcTyU1Rev7mO45S0=", + "lastModified": 1683560683, + "narHash": "sha256-XAygPMN5Xnk/W2c1aW0jyEa6lfMDZWlQgiNtmHXytPc=", "owner": "hercules-ci", "repo": "flake-parts", - "rev": "3502ee99d6dade045bdeaf7b0cd8ec703484c25c", + "rev": "006c75898cf814ef9497252b022e91c946ba8e17", "type": "github" }, "original": { @@ -762,6 +799,7 @@ "mms": "mms", "nixpkgs": "nixpkgs_8", "nixpkgs-unstable": "nixpkgs-unstable", + "spicetify-nix": "spicetify-nix", "url-eater": "url-eater", "vampysite": "vampysite" } @@ -775,11 +813,11 @@ ] }, "locked": { - "lastModified": 1680315536, - "narHash": "sha256-0AsBuKssJMbcRcw4HJQwJsUHhZxR5+gaf6xPQayhR44=", + "lastModified": 1683771545, + "narHash": "sha256-we0GYcKTo2jRQGmUGrzQ9VH0OYAUsJMCsK8UkF+vZUA=", "owner": "oxalica", "repo": "rust-overlay", - "rev": "5c8c151bdd639074a0051325c16df1a64ee23497", + "rev": "c57e210faf68e5d5386f18f1b17ad8365d25e4ed", "type": "github" }, "original": { @@ -788,6 +826,25 @@ "type": "github" } }, + "spicetify-nix": { + "inputs": { + "flake-utils": "flake-utils_4", + "nixpkgs": "nixpkgs_9" + }, + "locked": { + "lastModified": 1684872357, + "narHash": "sha256-10NR2inbTZnD2XfAtZ55+T8nOZo5e0TWUg3667APHco=", + "owner": "the-argus", + "repo": "spicetify-nix", + "rev": "16022e436ab3fe28ff8b5272a36fcadc0845b060", + "type": "github" + }, + "original": { + "owner": "the-argus", + "repo": "spicetify-nix", + "type": "github" + } + }, "stable": { "locked": { "lastModified": 1669735802, @@ -849,18 +906,48 @@ "type": "github" } }, + "systems_4": { + "locked": { + "lastModified": 1681028828, + "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=", + "owner": "nix-systems", + "repo": "default", + "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e", + "type": "github" + }, + "original": { + "owner": "nix-systems", + "repo": "default", + "type": "github" + } + }, + "systems_5": { + "locked": { + "lastModified": 1681028828, + "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=", + "owner": "nix-systems", + "repo": "default", + "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e", + "type": "github" + }, + "original": { + "owner": "nix-systems", + "repo": "default", + "type": "github" + } + }, "url-eater": { "inputs": { "naersk": "naersk_3", - "nixpkgs": "nixpkgs_10", - "utils": "utils_4" + "nixpkgs": "nixpkgs_11", + "utils": "utils_3" }, "locked": { - "lastModified": 1681562998, - "narHash": "sha256-VpuZIgIywqnB/JGMSfm1tJ9hai0u+CuRCnOLBCTAtuk=", + "lastModified": 1685257355, + "narHash": "sha256-1q9iFtbh5fk2kadX4UYyLZcr5zJJHhxRMmCPHsH3Pn0=", "owner": "AgathaSorceress", "repo": "url-eater", - "rev": "be1fed9ee7ffb7b61b2f16d143e1c62177ed3234", + "rev": "9f042508ee76b6920923c97ab39318e7075fde0e", "type": "github" }, "original": { @@ -906,21 +993,6 @@ } }, "utils_3": { - "locked": { - "lastModified": 1667395993, - "narHash": "sha256-nuEHfE/LcWyuSWnS8t12N1wc105Qtau+/OdUAjtQ0rA=", - "owner": "numtide", - "repo": "flake-utils", - "rev": "5aed5285a952e0b949eb3ba02c12fa4fcfef535f", - "type": "github" - }, - "original": { - "owner": "numtide", - "repo": "flake-utils", - "type": "github" - } - }, - "utils_4": { "locked": { "lastModified": 1678901627, "narHash": "sha256-U02riOqrKKzwjsxc/400XnElV+UtPUQWpANPlyazjH0=", @@ -935,9 +1007,9 @@ "type": "github" } }, - "utils_5": { + "utils_4": { "inputs": { - "systems": "systems_3" + "systems": "systems_5" }, "locked": { "lastModified": 1681202837, @@ -955,15 +1027,15 @@ }, "vampysite": { "inputs": { - "nixpkgs": "nixpkgs_11", - "utils": "utils_5" + "nixpkgs": "nixpkgs_12", + "utils": "utils_4" }, "locked": { - "lastModified": 1682852086, - "narHash": "sha256-jxkFNoaIRVaNLbv86amo5mgCDnWmGrKzvBkUwcp2Ahw=", + "lastModified": 1685378366, + "narHash": "sha256-BchGw5S0vollYbOqe9Dp1z2XA4I4wGHYI42cPM4Jvyo=", "ref": "refs/heads/mistress", - "rev": "663afd4160aa14ddfe738ebcf8a36d08ddbc3c96", - "revCount": 17, + "rev": "2d37f2e143ad6ff0d7528573acfe34242889f14e", + "revCount": 18, "type": "git", "url": "https://git.lain.faith/sorceress/vampysite" }, diff --git a/flake.nix b/flake.nix index d23c518..1b15eb1 100644 --- a/flake.nix +++ b/flake.nix @@ -1,10 +1,10 @@ { inputs = { - nixpkgs.url = "nixpkgs/nixos-22.11"; + nixpkgs.url = "nixpkgs/nixos-23.05"; nixpkgs-unstable.url = "nixpkgs/nixpkgs-unstable"; home-manager = { - url = "github:nix-community/home-manager/release-22.11"; + url = "github:nix-community/home-manager/release-23.05"; inputs.nixpkgs.follows = "nixpkgs"; }; @@ -23,10 +23,12 @@ frq-friend.url = "git+https://git.xenua.me/xenua/fedi-frq-friend"; vampysite.url = "git+https://git.lain.faith/sorceress/vampysite"; + spicetify-nix.url = "github:the-argus/spicetify-nix"; + helix.url = "github:helix-editor/helix"; }; outputs = { nixpkgs, nixpkgs-unstable, home-manager, mms, helix, url-eater - , colorpickle, frq-friend, colmena, vampysite, ... }: { + , colorpickle, frq-friend, colmena, vampysite, spicetify-nix, ... }: { colmena = { network = { description = "Agatha's Nix Infra"; @@ -39,6 +41,7 @@ colorpickle = colorpickle.packages.${final.system}.default; frq-friend = frq-friend.defaultPackage.${final.system}; vampysite = vampysite.packages.${final.system}.default; + spicetify-pkgs = spicetify-nix.packages.${final.system}.default; }) colmena.overlay ]; @@ -86,6 +89,7 @@ (import "${home-manager}/nixos") url-eater.nixosModule colorpickle.nixosModules.default + spicetify-nix.nixosModule ]; deployment = { diff --git a/hosts/bloodletting/configuration.nix b/hosts/bloodletting/configuration.nix index 4507efd..66e9f34 100644 --- a/hosts/bloodletting/configuration.nix +++ b/hosts/bloodletting/configuration.nix @@ -52,7 +52,7 @@ banner = '' Hello mistress ^,,^ ''; - passwordAuthentication = false; + settings.PasswordAuthentication = false; }; # Open ports in the firewall. @@ -62,13 +62,14 @@ from = 40000; to = 40200; }]; + trustedInterfaces = [ "podman0" ]; }; virtualisation = { podman = { enable = true; dockerCompat = true; - defaultNetwork.dnsname.enable = true; + defaultNetwork.settings.dns_enabled = true; }; oci-containers = { backend = "podman"; }; }; diff --git a/hosts/ritual/configuration.nix b/hosts/ritual/configuration.nix index 6d0d46d..b6b5272 100644 --- a/hosts/ritual/configuration.nix +++ b/hosts/ritual/configuration.nix @@ -27,20 +27,22 @@ banner = '' Hello mistress ^,,^ ''; - passwordAuthentication = false; + settings.PasswordAuthentication = false; }; virtualisation = { podman = { enable = true; dockerCompat = true; - defaultNetwork.dnsname.enable = true; + defaultNetwork.settings.dns_enabled = true; }; oci-containers = { backend = "podman"; }; }; - hardware.bluetooth.enable = true; - services.blueman.enable = true; + hardware.bluetooth = { + enable = true; + settings = { General = { Disable = "Headset"; }; }; + }; # This value determines the NixOS release from which the default # settings for stateful data, like file locations and database versions