diff --git a/flake.lock b/flake.lock index b9dbc1a..fc7e4a4 100644 --- a/flake.lock +++ b/flake.lock @@ -5,11 +5,11 @@ "nixpkgs": "nixpkgs" }, "locked": { - "lastModified": 1758270360, - "narHash": "sha256-yqh6EEhlpVWRoKl85o1s+QZ72UHWTvornnc3C0Ls484=", + "lastModified": 1754418797, + "narHash": "sha256-8UP/nu75GyNcdKW3FD/mRxhs5zWlRIpAQo8wgm9rVQE=", "owner": "catppuccin", "repo": "nix", - "rev": "2e0aacdd6abbecd1b1c0511a2fcd1460a6bc6645", + "rev": "9bdf7f5fb308409495523ea21bec5484b75b2492", "type": "github" }, "original": { @@ -114,11 +114,11 @@ ] }, "locked": { - "lastModified": 1756770412, - "narHash": "sha256-+uWLQZccFHwqpGqr2Yt5VsW/PbeJVTn9Dk6SHWhNRPw=", + "lastModified": 1754420989, + "narHash": "sha256-3e4wHzNwTMg7GaeLH9A091DMaO9AfFxUjpfqbddCUeo=", "owner": "hercules-ci", "repo": "flake-parts", - "rev": "4524271976b625a4a605beefd893f270620fd751", + "rev": "7f38f25a44023a21a504bd3fd9d4f41c4a39f55c", "type": "github" }, "original": { @@ -136,11 +136,11 @@ ] }, "locked": { - "lastModified": 1754487366, - "narHash": "sha256-pHYj8gUBapuUzKV/kN/tR3Zvqc7o6gdFB9XKXIp1SQ8=", + "lastModified": 1751413152, + "narHash": "sha256-Tyw1RjYEsp5scoigs1384gIg6e0GoBVjms4aXFfRssQ=", "owner": "hercules-ci", "repo": "flake-parts", - "rev": "af66ad14b28a127c5c0f3bbb298218fc63528a18", + "rev": "77826244401ea9de6e3bac47c2db46005e1f30b5", "type": "github" }, "original": { @@ -184,6 +184,24 @@ "type": "github" } }, + "flake-utils_3": { + "inputs": { + "systems": "systems_4" + }, + "locked": { + "lastModified": 1701680307, + "narHash": "sha256-kAuep2h5ajznlPMD9rnQyffWG8EM/C73lejGofXvdM8=", + "owner": "numtide", + "repo": "flake-utils", + "rev": "4022d587cbbfd70fe950c1e2083a02621806a725", + "type": "github" + }, + "original": { + "owner": "numtide", + "repo": "flake-utils", + "type": "github" + } + }, "flakey-profile": { "locked": { "lastModified": 1712898590, @@ -209,11 +227,11 @@ ] }, "locked": { - "lastModified": 1758108966, - "narHash": "sha256-ytw7ROXaWZ7OfwHrQ9xvjpUWeGVm86pwnEd1QhzawIo=", + "lastModified": 1754416808, + "narHash": "sha256-c6yg0EQ9xVESx6HGDOCMcyRSjaTpNJP10ef+6fRcofA=", "owner": "cachix", "repo": "git-hooks.nix", - "rev": "54df955a695a84cd47d4a43e08e1feaf90b1fd9b", + "rev": "9c52372878df6911f9afc1e2a1391f55e4dfc864", "type": "github" }, "original": { @@ -253,11 +271,11 @@ ] }, "locked": { - "lastModified": 1758022363, - "narHash": "sha256-ENUhCRWgSX4ni751HieNuQoq06dJvApV/Nm89kh+/A0=", + "lastModified": 1752595130, + "narHash": "sha256-CNBgr4OZSuklGtNOa9CnTNo9+Xceqn/EDAC1Tc43fH8=", "owner": "hercules-ci", "repo": "hercules-ci-effects", - "rev": "1a3667d33e247ad35ca250698d63f49a5453d824", + "rev": "5f2e09654b2e70ba643e41609d9f9b6640f22113", "type": "github" }, "original": { @@ -273,11 +291,11 @@ ] }, "locked": { - "lastModified": 1758296614, - "narHash": "sha256-l60D1i0aaSqemy9dL7wP0ePMfcv/oZbeKpvUMY+q0kQ=", + "lastModified": 1754457347, + "narHash": "sha256-QN9yZ1L5EmR16NNM+hNNzMjARk+FPjUeSE/ds4Kms0E=", "owner": "nix-community", "repo": "home-manager", - "rev": "55b1f5b7b191572257545413b98e37abab2fdb00", + "rev": "ad5d2b4aa770fdc74c80fd682fee0b00a8ad7991", "type": "github" }, "original": { @@ -340,11 +358,11 @@ "lix": { "flake": false, "locked": { - "lastModified": 1758307909, - "narHash": "sha256-aZ9gNCx5OtT++i6dUNbU4kRE9Nj9aLuOx7hNZW7FTn8=", - "rev": "3a4f9488f0a9ca46b22b38de7e0a760a9a63129a", + "lastModified": 1754416151, + "narHash": "sha256-H/SM37tCftT1gPWUmPv3q+FIwBoVf7JnxzRjZSeDPEw=", + "rev": "7e8b44d718a69364f7bfd58f463c345a555c2cfc", "type": "tarball", - "url": "https://git.lix.systems/api/v1/repos/lix-project/lix/archive/3a4f9488f0a9ca46b22b38de7e0a760a9a63129a.tar.gz" + "url": "https://git.lix.systems/api/v1/repos/lix-project/lix/archive/7e8b44d718a69364f7bfd58f463c345a555c2cfc.tar.gz" }, "original": { "type": "tarball", @@ -396,16 +414,17 @@ }, "moonlight": { "inputs": { + "flake-utils": "flake-utils_3", "nixpkgs": [ "nixpkgsUnstable" ] }, "locked": { - "lastModified": 1757448266, - "narHash": "sha256-aLjHKVWkb9XHyoMmDBxLG2Ycg4CJFeieLdEg3CWeIwk=", + "lastModified": 1754439168, + "narHash": "sha256-NcwRidwb/ask65LE86os4RkhyoPQo5sLu0sJs/NboK4=", "owner": "moonlight-mod", "repo": "moonlight", - "rev": "83debd7870e77e21694c9a76e3975baf842e435e", + "rev": "66b81b113afd6654a88c9adb7edb7fe92839fe84", "type": "github" }, "original": { @@ -422,11 +441,11 @@ ] }, "locked": { - "lastModified": 1756852730, - "narHash": "sha256-qPere4RBHoZxiEGl8zXU8gjroZg4gkYGEwaAbKmL4vE=", + "lastModified": 1741303672, + "narHash": "sha256-eRKbKccBu3PK/oJpmUuLo+0v45d0SEjosE8tVsHbpeA=", "owner": "musnix", "repo": "musnix", - "rev": "7ccc92050e43dc92309396c6f2fe1f542214a242", + "rev": "d56a15f30329f304151e4e05fa82264d127da934", "type": "github" }, "original": { @@ -446,11 +465,11 @@ "treefmt-nix": "treefmt-nix" }, "locked": { - "lastModified": 1758326788, - "narHash": "sha256-jTy1mZXyUQEsnyyye8y+jM49FkSIwT3wUviNRocS4oE=", + "lastModified": 1754471276, + "narHash": "sha256-OrgCULwvrBKnns8lzX2124pXzAAoi7jeLHi134yNC+I=", "owner": "nix-community", "repo": "neovim-nightly-overlay", - "rev": "7660a81d4710ef71df2ab352220d11c0873ab494", + "rev": "6ec3826060fb1110a2ea1ff9aff32e476adb2d0a", "type": "github" }, "original": { @@ -462,11 +481,11 @@ "neovim-src": { "flake": false, "locked": { - "lastModified": 1758319198, - "narHash": "sha256-vbtHQm0FRX1Qa7uSguBiW7zmzSVpTXUEU96kRwapI1M=", + "lastModified": 1754426054, + "narHash": "sha256-3clYVRl9XbRZXnPtMU2QuSo4FsUQvPOZCML5J2b9YHc=", "owner": "neovim", "repo": "neovim", - "rev": "19ba5899460ffdbf159ad4323ae5f3af6ce2eb53", + "rev": "820fb89172b7d21faa6c3714a58c97308d9e67e3", "type": "github" }, "original": { @@ -482,11 +501,11 @@ ] }, "locked": { - "lastModified": 1758102940, - "narHash": "sha256-wwqf3+A8EiqwWpcAaPN20QXJLlpGPpwtLTrzgnngI2o=", + "lastModified": 1751313918, + "narHash": "sha256-HsJM3XLa43WpG+665aGEh8iS8AfEwOIQWk3Mke3e7nk=", "owner": "LnL7", "repo": "nix-darwin", - "rev": "ebd0bfc11fc2b5cff37401e9b3703881ad5fabbd", + "rev": "e04a388232d9a6ba56967ce5b53a8a6f713cdfcf", "type": "github" }, "original": { @@ -565,11 +584,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1758035966, - "narHash": "sha256-qqIJ3yxPiB0ZQTT9//nFGQYn8X/PBoJbofA7hRKZnmE=", + "lastModified": 1753694789, + "narHash": "sha256-cKgvtz6fKuK1Xr5LQW/zOUiAC0oSQoA9nOISB0pJZqM=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "8d4ddb19d03c65a36ad8d189d001dc32ffb0306b", + "rev": "dc9637876d0dcc8c9e5e22986b857632effeb727", "type": "github" }, "original": { @@ -596,11 +615,11 @@ }, "nixpkgsSmall": { "locked": { - "lastModified": 1758251931, - "narHash": "sha256-m2v94CWDmvezPO6xKB7M9IQbaY+SQMsACD8T5rspotE=", + "lastModified": 1754386664, + "narHash": "sha256-Zu8TCY5niHj5dSnbez1gJy8A+rF5bxu0yTrpvhpB6vc=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "5bb6983cc938bb40aa829d2ccf420ca7faacbd41", + "rev": "c0b2405c1d88328e059119fb5576206f0e137e3b", "type": "github" }, "original": { @@ -612,11 +631,11 @@ }, "nixpkgsUnstable": { "locked": { - "lastModified": 1758198701, - "narHash": "sha256-7To75JlpekfUmdkUZewnT6MoBANS0XVypW6kjUOXQwc=", + "lastModified": 1754214453, + "narHash": "sha256-Q/I2xJn/j1wpkGhWkQnm20nShYnG7TI99foDBpXm1SY=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "0147c2f1d54b30b5dd6d4a8c8542e8d7edf93b5d", + "rev": "5b09dc45f24cf32316283e62aec81ffee3c3e376", "type": "github" }, "original": { @@ -660,11 +679,11 @@ }, "nixpkgs_4": { "locked": { - "lastModified": 1758262103, - "narHash": "sha256-aBGl3XEOsjWw6W3AHiKibN7FeoG73dutQQEqnd/etR8=", + "lastModified": 1754340878, + "narHash": "sha256-lgmUyVQL9tSnvvIvBp7x1euhkkCho7n3TMzgjdvgPoU=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "12bd230118a1901a4a5d393f9f56b6ad7e571d01", + "rev": "cab778239e705082fe97bb4990e0d24c50924c04", "type": "github" }, "original": { @@ -676,11 +695,11 @@ }, "nixpkgs_5": { "locked": { - "lastModified": 1758216857, - "narHash": "sha256-h1BW2y7CY4LI9w61R02wPaOYfmYo82FyRqHIwukQ6SY=", + "lastModified": 1754292888, + "narHash": "sha256-1ziydHSiDuSnaiPzCQh1mRFBsM2d2yRX9I+5OPGEmIE=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "d2ed99647a4b195f0bcc440f76edfa10aeb3b743", + "rev": "ce01daebf8489ba97bd1609d185ea276efdeb121", "type": "github" }, "original": { @@ -692,11 +711,11 @@ }, "nixpkgs_6": { "locked": { - "lastModified": 1757746433, - "narHash": "sha256-fEvTiU4s9lWgW7mYEU/1QUPirgkn+odUBTaindgiziY=", + "lastModified": 1744868846, + "narHash": "sha256-5RJTdUHDmj12Qsv7XOhuospjAjATNiTMElplWnJE9Hs=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "6d7ec06d6868ac6d94c371458fc2391ded9ff13d", + "rev": "ebe4301cbd8f81c4f8d3244b3632338bbeb6d49c", "type": "github" }, "original": { @@ -708,11 +727,11 @@ }, "nixpkgs_7": { "locked": { - "lastModified": 1756636162, - "narHash": "sha256-mBecwgUTWRgClJYqcF+y4O1bY8PQHqeDpB+zsAn+/zA=", + "lastModified": 1753934836, + "narHash": "sha256-G06FmIBj0I5bMW1Q8hAEIl5N7IHMK7+Ta4KA+BmneDA=", "owner": "nixos", "repo": "nixpkgs", - "rev": "37ff64b7108517f8b6ba5705ee5085eac636a249", + "rev": "8679b16e11becd487b45d568358ddf9d5640d860", "type": "github" }, "original": { @@ -800,11 +819,11 @@ ] }, "locked": { - "lastModified": 1756607787, - "narHash": "sha256-ciwAdgtlAN1PCaidWK6RuWsTBL8DVuyDCGM+X3ein5Q=", + "lastModified": 1753930086, + "narHash": "sha256-Os6Ta5zamfAllmQNlvkbGZLHn06zJy3hVXRk+Dy2yMo=", "owner": "oxalica", "repo": "rust-overlay", - "rev": "f46d294b87ebb9f7124f1ce13aa2a5f5acc0f3eb", + "rev": "17b672c10c1798696a516cb879edbc2ebd0f58a4", "type": "github" }, "original": { @@ -818,11 +837,11 @@ "nixpkgs": "nixpkgs_6" }, "locked": { - "lastModified": 1758007585, - "narHash": "sha256-HYnwlbY6RE5xVd5rh0bYw77pnD8lOgbT4mlrfjgNZ0c=", + "lastModified": 1754328224, + "narHash": "sha256-glPK8DF329/dXtosV7YSzRlF4n35WDjaVwdOMEoEXHA=", "owner": "Mic92", "repo": "sops-nix", - "rev": "f77d4cfa075c3de66fc9976b80e0c4fc69e2c139", + "rev": "49021900e69812ba7ddb9e40f9170218a7eca9f4", "type": "github" }, "original": { @@ -838,11 +857,11 @@ "rust-overlay": "rust-overlay" }, "locked": { - "lastModified": 1758331784, - "narHash": "sha256-p875/DbftYnTkogv2CeNe5eMYrX9LCEaFGuMoDv3dj4=", + "lastModified": 1754041947, + "narHash": "sha256-KzuedC2yJU56sRBeMlndPuXK6UWHxSUtgAmJ/+Gww6I=", "owner": "LGFae", "repo": "swww", - "rev": "16f284670913750216112ce59849b1e82e63d4cb", + "rev": "63d71f2b8c6d1533b5fef748dfc490dd461e343c", "type": "github" }, "original": { @@ -896,6 +915,21 @@ "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" + } + }, "treefmt-nix": { "inputs": { "nixpkgs": [ @@ -904,11 +938,11 @@ ] }, "locked": { - "lastModified": 1758206697, - "narHash": "sha256-/DbPkh6PZOgfueCbs3uzlk4ASU2nPPsiVWhpMCNkAd0=", + "lastModified": 1754061284, + "narHash": "sha256-ONcNxdSiPyJ9qavMPJYAXDNBzYobHRxw0WbT38lKbwU=", "owner": "numtide", "repo": "treefmt-nix", - "rev": "128222dc911b8e2e18939537bed1762b7f3a04aa", + "rev": "58bd4da459f0a39e506847109a2a5cfceb837796", "type": "github" }, "original": { @@ -925,11 +959,11 @@ ] }, "locked": { - "lastModified": 1758255782, - "narHash": "sha256-uBjTUcpb+P1nMoj0jDfIavNPJ3zkGmatvvxU2TTHSXQ=", + "lastModified": 1754458246, + "narHash": "sha256-6fvYurXcdg+AC7IBoLEgRIU3GXMaAaVwnteKk9OKBBM=", "owner": "0xc000022070", "repo": "zen-browser-flake", - "rev": "ef8fb5704a9aa2845d95ef36b5250a57fb6d5bd6", + "rev": "f806c5bfd831b8f9333b31f45b85b711025ba3de", "type": "github" }, "original": { diff --git a/home-manager/dotfiles/niri/config.kdl b/home-manager/dotfiles/niri/config.kdl index 166259b..9045ade 100644 --- a/home-manager/dotfiles/niri/config.kdl +++ b/home-manager/dotfiles/niri/config.kdl @@ -572,7 +572,7 @@ binds { // wayland support spawn-at-startup "xwayland-satellite" spawn-at-startup "swww-daemon" -spawn-at-startup "~/config/niri/start-bg.sh" +spawn-at-startup "bash" "~/.config/niri/background.sh" "~/.config/niri/wallpapers" environment { DISPLAY ":0" diff --git a/home-manager/dotfiles/niri/start-bg.sh b/home-manager/dotfiles/niri/start-bg.sh deleted file mode 100755 index a2ab43a..0000000 --- a/home-manager/dotfiles/niri/start-bg.sh +++ /dev/null @@ -1,3 +0,0 @@ -#!/bin/sh - -./background.sh ~/.config/niri/wallpapers/ diff --git a/home-manager/home.nix b/home-manager/home.nix index 4feb8c7..4007d97 100644 --- a/home-manager/home.nix +++ b/home-manager/home.nix @@ -81,13 +81,13 @@ fuzzel zsh-syntax-highlighting + cinny-desktop dysk rsync obsidian papirus-icon-theme nvimpager mpc - fastfetch # # You can also create simple shell scripts directly inside your # # configuration. For example, this adds a command 'my-hello' to your # # environment: @@ -260,6 +260,7 @@ mpv.enable = true; mako.enable = true; lazygit.enable = true; + gtk.enable = true; fzf.enable = true; swaylock.enable = true; foot.enable = true; @@ -373,11 +374,6 @@ # }; # }; - dconf = { - enable = true; - settings."org/gnome/desktop/interface".color-scheme = "prefer-dark"; - }; - # Let Home Manager install and manage itself. programs.home-manager.enable = true; } diff --git a/hosts/goober/configuration.nix b/hosts/goober/configuration.nix index dbfd47b..cdefbc7 100644 --- a/hosts/goober/configuration.nix +++ b/hosts/goober/configuration.nix @@ -17,7 +17,6 @@ ./hardware-configuration.nix ../../shared/client/tailscale.nix ../../shared/client/niri.nix - ../../shared/client/nh.nix ./features/default.nix ]; @@ -89,7 +88,6 @@ "video" "networkmanager" "podman" - "dialout" ]; packages = with pkgs; [ @@ -135,9 +133,7 @@ }; documentation.dev.enable = true; - systemd.settings.Manager = { - "DefaultLimitNOFILE" = "524288"; - }; + systemd.extraConfig = "DefaultLimitNOFILE=524288"; security.pam.loginLimits = [ { domain = "misschloe777"; @@ -146,9 +142,6 @@ value = "524288"; } ]; - nixpkgs.config.permittedInsecurePackages = [ - "libsoup-2.74.3" - ]; # This option defines the first version of NixOS you have installed on this particular machine, # and is used to maintain compatibility with application data (e.g. databases) created on older NixOS versions. diff --git a/hosts/goober/features/software/workstation.nix b/hosts/goober/features/software/workstation.nix index 6f8bb63..96b295f 100644 --- a/hosts/goober/features/software/workstation.nix +++ b/hosts/goober/features/software/workstation.nix @@ -79,8 +79,6 @@ # games tetrio-desktop osu-lazer-bin - ungoogled-chromium - esptool ]; services.mpdscribble = { diff --git a/hosts/workstation/features/software/workstation.nix b/hosts/workstation/features/software/workstation.nix index e079a7e..05392e2 100644 --- a/hosts/workstation/features/software/workstation.nix +++ b/hosts/workstation/features/software/workstation.nix @@ -22,6 +22,7 @@ gvfs nil bitwarden + qutebrowser ]; virtualisation.containers.enable = true; diff --git a/shared/default.nix b/shared/default.nix index 4772991..d45cdee 100644 --- a/shared/default.nix +++ b/shared/default.nix @@ -10,16 +10,15 @@ imports = [ ./ssh.nix ]; - environment.systemPackages = with pkgs; [ - curl - unzip - kitty.terminfo - foot.terminfo - kittysay - tmux - fzf - fastfetch - dnsutils + environment.systemPackages = [ + pkgs.curl + pkgs.unzip + pkgs.kitty.terminfo + pkgs.foot.terminfo + pkgs.kittysay + pkgs.tmux + pkgs.fzf + pkgs.fastfetch ]; environment.variables.EDITOR = "nvim";