diff --git a/flake.lock b/flake.lock index 70c8c21..6d6cd5f 100644 --- a/flake.lock +++ b/flake.lock @@ -171,11 +171,11 @@ ] }, "locked": { - "lastModified": 1728330715, - "narHash": "sha256-xRJ2nPOXb//u1jaBnDP56M7v5ldavjbtR6lfGqSvcKg=", + "lastModified": 1735644329, + "narHash": "sha256-tO3HrHriyLvipc4xr+Ewtdlo7wM1OjXNjlWRgmM7peY=", "owner": "numtide", "repo": "devshell", - "rev": "dd6b80932022cea34a019e2bb32f6fa9e494dfef", + "rev": "f7795ede5b02664b57035b3b757876703e2c3eac", "type": "github" }, "original": { @@ -209,11 +209,11 @@ ] }, "locked": { - "lastModified": 1735468753, - "narHash": "sha256-2dt1nOe9zf9pDkf5Kn7FUFyPRo581s0n90jxYXJ94l0=", + "lastModified": 1736437680, + "narHash": "sha256-9Sy17XguKdEU9M5peTrkWSlI/O5IAqjHzdzxbXnc30g=", "owner": "nix-community", "repo": "disko", - "rev": "84a5b93637cc16cbfcc61b6e1684d626df61eb21", + "rev": "4d5d07d37ff773338e40a92088f45f4f88e509c8", "type": "github" }, "original": { @@ -231,11 +231,11 @@ }, "locked": { "dir": "pkgs/firefox-addons", - "lastModified": 1735979945, - "narHash": "sha256-qT25PnbcQ30ypnI8fNazRDsq3WmBXC8Lo+OvPr+Ct+o=", + "lastModified": 1736422372, + "narHash": "sha256-BYTeKU+L1LfvrcFB92Y5pcAtiRb3Z9CXirQiHIuqiFk=", "owner": "rycee", "repo": "nur-expressions", - "rev": "b93d8cdf12139da45146a6c3cf53141a437c41ec", + "rev": "cb6b76f8f3058d214f98d72657b2c96cb50d96ef", "type": "gitlab" }, "original": { @@ -245,6 +245,22 @@ "type": "gitlab" } }, + "firefox-gnome-theme": { + "flake": false, + "locked": { + "lastModified": 1734969791, + "narHash": "sha256-A9PxLienMYJ/WUvqFie9qXrNC2MeRRYw7TG/q7DRjZg=", + "owner": "rafaelmardojai", + "repo": "firefox-gnome-theme", + "rev": "92f4890bd150fc9d97b61b3583680c0524a8cafe", + "type": "github" + }, + "original": { + "owner": "rafaelmardojai", + "repo": "firefox-gnome-theme", + "type": "github" + } + }, "flake-compat": { "flake": false, "locked": { @@ -370,11 +386,11 @@ ] }, "locked": { - "lastModified": 1733312601, - "narHash": "sha256-4pDvzqnegAfRkPwO3wmwBhVi/Sye1mzps0zHWYnP88c=", + "lastModified": 1735774679, + "narHash": "sha256-soePLBazJk0qQdDVhdbM98vYdssfs3WFedcq+raipRI=", "owner": "hercules-ci", "repo": "flake-parts", - "rev": "205b12d8b7cd4802fbcb8e8ef6a0f1408781a4f9", + "rev": "f2f7418ce0ab4a5309a4596161d154cfc877af66", "type": "github" }, "original": { @@ -454,7 +470,7 @@ }, "flake-utils_3": { "inputs": { - "systems": "systems_4" + "systems": "systems_3" }, "locked": { "lastModified": 1731533236, @@ -491,29 +507,6 @@ "type": "github" } }, - "flatpaks": { - "inputs": { - "home-manager": "home-manager", - "nixpkgs": [ - "nixpkgs" - ], - "systems": "systems_2" - }, - "locked": { - "lastModified": 1733581530, - "narHash": "sha256-W+orHmF+XpZosrBFAFRs7sS1iVKYveg9SutkzSXMVsI=", - "owner": "GermanBread", - "repo": "declarative-flatpak", - "rev": "b88bd5b65f8e7c35eec0a90cfd6e096b2e7f79c0", - "type": "github" - }, - "original": { - "owner": "GermanBread", - "ref": "stable-v3", - "repo": "declarative-flatpak", - "type": "github" - } - }, "fromYaml": { "flake": false, "locked": { @@ -540,18 +533,45 @@ "nixpkgs": [ "nixvim", "nixpkgs" + ] + }, + "locked": { + "lastModified": 1735882644, + "narHash": "sha256-3FZAG+pGt3OElQjesCAWeMkQ7C/nB1oTHLRQ8ceP110=", + "owner": "cachix", + "repo": "git-hooks.nix", + "rev": "a5a961387e75ae44cc20f0a57ae463da5e959656", + "type": "github" + }, + "original": { + "owner": "cachix", + "repo": "git-hooks.nix", + "type": "github" + } + }, + "git-hooks_2": { + "inputs": { + "flake-compat": [ + "stylix", + "flake-compat" + ], + "gitignore": "gitignore_3", + "nixpkgs": [ + "stylix", + "nixpkgs" ], "nixpkgs-stable": [ - "nixvim", + "stylix", + "git-hooks", "nixpkgs" ] }, "locked": { - "lastModified": 1734797603, - "narHash": "sha256-ulZN7ps8nBV31SE+dwkDvKIzvN6hroRY8sYOT0w+E28=", + "lastModified": 1731363552, + "narHash": "sha256-vFta1uHnD29VUY4HJOO/D6p6rxyObnf+InnSMT4jlMU=", "owner": "cachix", "repo": "git-hooks.nix", - "rev": "f0f0dc4920a903c3e08f5bdb9246bb572fcae498", + "rev": "cd1af27aa85026ac759d5d3fccf650abe7e1bbf0", "type": "github" }, "original": { @@ -605,6 +625,28 @@ } }, "gitignore_3": { + "inputs": { + "nixpkgs": [ + "stylix", + "git-hooks", + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1709087332, + "narHash": "sha256-HG2cCnktfHsKV0s4XW83gU3F57gaTljL9KNSuG6bnQs=", + "owner": "hercules-ci", + "repo": "gitignore.nix", + "rev": "637db329424fd7e46cf4185293b9cc8c88c95394", + "type": "github" + }, + "original": { + "owner": "hercules-ci", + "repo": "gitignore.nix", + "type": "github" + } + }, + "gitignore_4": { "inputs": { "nixpkgs": [ "xremap", @@ -646,11 +688,11 @@ }, "hardware": { "locked": { - "lastModified": 1735388221, - "narHash": "sha256-e5IOgjQf0SZcFCEV/gMGrsI0gCJyqOKShBQU0iiM3Kg=", + "lastModified": 1736441705, + "narHash": "sha256-OL7leZ6KBhcDF3nEKe4aZVfIm6xQpb1Kb+mxySIP93o=", "owner": "nixos", "repo": "nixos-hardware", - "rev": "7c674c6734f61157e321db595dbfcd8523e04e19", + "rev": "8870dcaff63dfc6647fb10648b827e9d40b0a337", "type": "github" }, "original": { @@ -681,7 +723,7 @@ "nixpkgs": [ "nixpkgs" ], - "systems": "systems_3", + "systems": "systems_2", "treefmt-nix": "treefmt-nix" }, "locked": { @@ -701,14 +743,16 @@ }, "home-manager": { "inputs": { - "nixpkgs": "nixpkgs_2" + "nixpkgs": [ + "nixpkgs" + ] }, "locked": { - "lastModified": 1733572789, - "narHash": "sha256-zjO6m5BqxXIyjrnUziAzk4+T4VleqjstNudSqWcpsHI=", + "lastModified": 1736373539, + "narHash": "sha256-dinzAqCjenWDxuy+MqUQq0I4zUSfaCvN9rzuCmgMZJY=", "owner": "nix-community", "repo": "home-manager", - "rev": "c7ffc9727d115e433fd884a62dc164b587ff651d", + "rev": "bd65bc3cde04c16755955630b344bc9e35272c56", "type": "github" }, "original": { @@ -719,27 +763,6 @@ } }, "home-manager_2": { - "inputs": { - "nixpkgs": [ - "nixpkgs" - ] - }, - "locked": { - "lastModified": 1735344290, - "narHash": "sha256-oJDtWPH1oJT34RJK1FSWjwX4qcGOBRkcNQPD0EbSfNM=", - "owner": "nix-community", - "repo": "home-manager", - "rev": "613691f285dad87694c2ba1c9e6298d04736292d", - "type": "github" - }, - "original": { - "owner": "nix-community", - "ref": "release-24.11", - "repo": "home-manager", - "type": "github" - } - }, - "home-manager_3": { "inputs": { "nixpkgs": [ "nixvim", @@ -761,7 +784,7 @@ "type": "github" } }, - "home-manager_4": { + "home-manager_3": { "inputs": { "nixpkgs": [ "stylix", @@ -783,7 +806,7 @@ "type": "github" } }, - "home-manager_5": { + "home-manager_4": { "inputs": { "nixpkgs": "nixpkgs_7" }, @@ -877,7 +900,7 @@ "hyprwayland-scanner": "hyprwayland-scanner", "nixpkgs": "nixpkgs_8", "pre-commit-hooks": "pre-commit-hooks", - "systems": "systems_7", + "systems": "systems_6", "xdph": "xdph" }, "locked": { @@ -1075,11 +1098,11 @@ ] }, "locked": { - "lastModified": 1735218083, - "narHash": "sha256-MoUAbmXz9TEr7zlKDRO56DBJHe30+7B5X7nhXm+Vpc8=", + "lastModified": 1735956190, + "narHash": "sha256-svzx3yVXD5tbBJZCn3Lt1RriH8GHo6CyVUPTHejf7sU=", "owner": "lnl7", "repo": "nix-darwin", - "rev": "bc03f7818771a75716966ce8c23110b715eff2aa", + "rev": "3feaf376d75d3d58ebf7e9a4f584d00628548ad9", "type": "github" }, "original": { @@ -1088,6 +1111,22 @@ "type": "github" } }, + "nix-flatpak": { + "locked": { + "lastModified": 1734128415, + "narHash": "sha256-HLwdVNxpuTsLlM3tCkpbQU6yCehdgf3kOS1G2SDlkzY=", + "owner": "gmodena", + "repo": "nix-flatpak", + "rev": "8bdc2540da516006d07b04019eb57ae0781a04b3", + "type": "github" + }, + "original": { + "owner": "gmodena", + "ref": "latest", + "repo": "nix-flatpak", + "type": "github" + } + }, "nixpkgs": { "locked": { "lastModified": 1719082008, @@ -1186,11 +1225,11 @@ }, "nixpkgs-unstable": { "locked": { - "lastModified": 1735834308, - "narHash": "sha256-dklw3AXr3OGO4/XT1Tu3Xz9n/we8GctZZ75ZWVqAVhk=", + "lastModified": 1736344531, + "narHash": "sha256-8YVQ9ZbSfuUk2bUf2KRj60NRraLPKPS0Q4QFTbc+c2c=", "owner": "nixos", "repo": "nixpkgs", - "rev": "6df24922a1400241dae323af55f30e4318a6ca65", + "rev": "bffc22eb12172e6db3c5dde9e3e5628f8e3e7912", "type": "github" }, "original": { @@ -1201,22 +1240,6 @@ } }, "nixpkgs_2": { - "locked": { - "lastModified": 1731755305, - "narHash": "sha256-v5P3dk5JdiT+4x69ZaB18B8+Rcu3TIOrcdG4uEX7WZ8=", - "owner": "NixOS", - "repo": "nixpkgs", - "rev": "057f63b6dc1a2c67301286152eb5af20747a9cb4", - "type": "github" - }, - "original": { - "owner": "NixOS", - "ref": "nixos-24.11", - "repo": "nixpkgs", - "type": "github" - } - }, - "nixpkgs_3": { "locked": { "lastModified": 1705856552, "narHash": "sha256-JXfnuEf5Yd6bhMs/uvM67/joxYKoysyE3M2k6T3eWbg=", @@ -1232,17 +1255,33 @@ "type": "github" } }, + "nixpkgs_3": { + "locked": { + "lastModified": 1736200483, + "narHash": "sha256-JO+lFN2HsCwSLMUWXHeOad6QUxOuwe9UOAF/iSl1J4I=", + "owner": "nixos", + "repo": "nixpkgs", + "rev": "3f0a8ac25fb674611b98089ca3a5dd6480175751", + "type": "github" + }, + "original": { + "owner": "nixos", + "ref": "nixos-24.11", + "repo": "nixpkgs", + "type": "github" + } + }, "nixpkgs_4": { "locked": { "lastModified": 1735669367, "narHash": "sha256-tfYRbFhMOnYaM4ippqqid3BaLOXoFNdImrfBfCp4zn0=", - "owner": "nixos", + "owner": "NixOS", "repo": "nixpkgs", "rev": "edf04b75c13c2ac0e54df5ec5c543e300f76f1c9", "type": "github" }, "original": { - "owner": "nixos", + "owner": "NixOS", "ref": "nixos-24.11", "repo": "nixpkgs", "type": "github" @@ -1334,20 +1373,18 @@ "flake-compat": "flake-compat_3", "flake-parts": "flake-parts_3", "git-hooks": "git-hooks", - "home-manager": "home-manager_3", + "home-manager": "home-manager_2", "nix-darwin": "nix-darwin", - "nixpkgs": [ - "nixpkgs" - ], + "nixpkgs": "nixpkgs_4", "nuschtosSearch": "nuschtosSearch", "treefmt-nix": "treefmt-nix_2" }, "locked": { - "lastModified": 1735389157, - "narHash": "sha256-3co5A7PUEN+Bm7b3/6BxFsmvplg3XYUNR2MzWnheZoE=", + "lastModified": 1735993984, + "narHash": "sha256-Syew+5yuzysUr07SrGD+GRfZjE11h36TSYbxzEHYyyc=", "owner": "nix-community", "repo": "nixvim", - "rev": "c8fa65c6ac35dba157de0873d645ab398c370123", + "rev": "6bd1c7c5927fa9fdfdfd68f5aa772e6a62b9d779", "type": "github" }, "original": { @@ -1367,11 +1404,11 @@ ] }, "locked": { - "lastModified": 1733773348, - "narHash": "sha256-Y47y+LesOCkJaLvj+dI/Oa6FAKj/T9sKVKDXLNsViPw=", + "lastModified": 1735854821, + "narHash": "sha256-Iv59gMDZajNfezTO0Fw6LHE7uKAShxbvMidmZREit7c=", "owner": "NuschtOS", "repo": "search", - "rev": "3051be7f403bff1d1d380e4612f0c70675b44fc9", + "rev": "836908e3bddd837ae0f13e215dd48767aee355f0", "type": "github" }, "original": { @@ -1386,7 +1423,7 @@ "nixpkgs": [ "nixpkgs" ], - "systems": "systems_5", + "systems": "systems_4", "treefmt-nix": "treefmt-nix_3" }, "locked": { @@ -1427,7 +1464,7 @@ "pre-commit-hooks": { "inputs": { "flake-compat": "flake-compat_5", - "gitignore": "gitignore_3", + "gitignore": "gitignore_4", "nixpkgs": [ "xremap", "hyprland", @@ -1455,11 +1492,11 @@ "arkenfox": "arkenfox", "disko": "disko", "firefox-addons": "firefox-addons", - "flatpaks": "flatpaks", "hardware": "hardware", "heliox-cli": "heliox-cli", - "home-manager": "home-manager_2", - "nixpkgs": "nixpkgs_4", + "home-manager": "home-manager", + "nix-flatpak": "nix-flatpak", + "nixpkgs": "nixpkgs_3", "nixpkgs-unstable": "nixpkgs-unstable", "nixvim": "nixvim", "picokontroller": "picokontroller", @@ -1475,11 +1512,11 @@ ] }, "locked": { - "lastModified": 1735844895, - "narHash": "sha256-CIRlqX9tBK2awJkmVu2cKuap/0QziDXStQZ/u/+e8Z4=", + "lastModified": 1736203741, + "narHash": "sha256-eSjkBwBdQk+TZWFlLbclF2rAh4JxbGg8az4w/Lfe7f4=", "owner": "Mic92", "repo": "sops-nix", - "rev": "24d89184adf76d7ccc99e659dc5f3838efb5ee32", + "rev": "c9c88f08e3ee495e888b8d7c8624a0b2519cb773", "type": "github" }, "original": { @@ -1494,24 +1531,26 @@ "base16-fish": "base16-fish", "base16-helix": "base16-helix", "base16-vim": "base16-vim", + "firefox-gnome-theme": "firefox-gnome-theme", "flake-compat": "flake-compat_4", "flake-utils": "flake-utils_4", + "git-hooks": "git-hooks_2", "gnome-shell": "gnome-shell", - "home-manager": "home-manager_4", + "home-manager": "home-manager_3", "nixpkgs": [ "nixpkgs" ], - "systems": "systems_6", + "systems": "systems_5", "tinted-foot": "tinted-foot", "tinted-kitty": "tinted-kitty", "tinted-tmux": "tinted-tmux" }, "locked": { - "lastModified": 1734110444, - "narHash": "sha256-fp1iV2JldCSvz+7ODzXYUkQ+H7zyiWw5E0MQ4ILC4vw=", + "lastModified": 1736381946, + "narHash": "sha256-k66y4eMHZiJO3N43wuZOdoRmGmNwIj3EZq6NGK+AEM8=", "owner": "danth", "repo": "stylix", - "rev": "9015d5d0d5d100f849129c43d257b827d300b089", + "rev": "c62df1918d178ade64dc8a2df99e78a5d5f20514", "type": "github" }, "original": { @@ -1538,16 +1577,16 @@ }, "systems_2": { "locked": { - "lastModified": 1689347949, - "narHash": "sha256-12tWmuL2zgBgZkdoB6qXZsgJEH9LR3oUgpaQq2RbI80=", + "lastModified": 1681028828, + "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=", "owner": "nix-systems", - "repo": "default-linux", - "rev": "31732fcf5e8fea42e59c2488ad31a0e651500f68", + "repo": "default", + "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e", "type": "github" }, "original": { "owner": "nix-systems", - "repo": "default-linux", + "repo": "default", "type": "github" } }, @@ -1597,21 +1636,6 @@ } }, "systems_6": { - "locked": { - "lastModified": 1681028828, - "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=", - "owner": "nix-systems", - "repo": "default", - "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e", - "type": "github" - }, - "original": { - "owner": "nix-systems", - "repo": "default", - "type": "github" - } - }, - "systems_7": { "locked": { "lastModified": 1689347949, "narHash": "sha256-12tWmuL2zgBgZkdoB6qXZsgJEH9LR3oUgpaQq2RbI80=", @@ -1678,7 +1702,7 @@ }, "treefmt-nix": { "inputs": { - "nixpkgs": "nixpkgs_3" + "nixpkgs": "nixpkgs_2" }, "locked": { "lastModified": 1706462057, @@ -1702,11 +1726,11 @@ ] }, "locked": { - "lastModified": 1735135567, - "narHash": "sha256-8T3K5amndEavxnludPyfj3Z1IkcFdRpR23q+T0BVeZE=", + "lastModified": 1735905407, + "narHash": "sha256-1hKMRIT+QZNWX46e4gIovoQ7H8QRb7803ZH4qSKI45o=", "owner": "numtide", "repo": "treefmt-nix", - "rev": "9e09d30a644c57257715902efbb3adc56c79cf28", + "rev": "29806abab803e498df96d82dd6f34b32eb8dd2c8", "type": "github" }, "original": { @@ -1803,7 +1827,7 @@ "crane": "crane", "devshell": "devshell_2", "flake-parts": "flake-parts_5", - "home-manager": "home-manager_5", + "home-manager": "home-manager_4", "hyprland": "hyprland", "nixpkgs": [ "nixpkgs" diff --git a/flake.nix b/flake.nix index b1d15fc..036884f 100644 --- a/flake.nix +++ b/flake.nix @@ -34,10 +34,11 @@ inputs.nixpkgs.follows = "nixpkgs"; }; - flatpaks = { - url = "github:GermanBread/declarative-flatpak/stable-v3"; - inputs.nixpkgs.follows = "nixpkgs"; - }; + # flatpaks = { + # url = "github:GermanBread/declarative-flatpak/stable-v3"; + # inputs.nixpkgs.follows = "nixpkgs"; + # }; + nix-flatpak.url = "github:gmodena/nix-flatpak/?ref=latest"; heliox-cli = { url = "git+https://git.ghoscht.com/heliox/cli?ref=custom-dimming"; @@ -64,10 +65,7 @@ inputs.nixpkgs.follows = "nixpkgs"; }; - nixvim = { - url = "github:nix-community/nixvim/nixos-24.11"; - inputs.nixpkgs.follows = "nixpkgs"; - }; + nixvim.url = "github:nix-community/nixvim/nixos-24.11"; }; outputs = { diff --git a/home/features/cli/default.nix b/home/features/cli/default.nix index 2d85507..2ca00cf 100644 --- a/home/features/cli/default.nix +++ b/home/features/cli/default.nix @@ -22,7 +22,7 @@ jq # JSON pretty printer and manipulator timer # Nice looking timer lazydocker # Docker TUI - neofetch # Unixporn stuff + fastfetch # Unixporn stuff tldr # Nice & short manual snippets ntfy-sh # Push notifications to other devices ipinfo # IP geolocation diff --git a/home/features/desktop/common/flatpak.nix b/home/features/desktop/common/flatpak.nix index 395c48d..c5cf9fc 100644 --- a/home/features/desktop/common/flatpak.nix +++ b/home/features/desktop/common/flatpak.nix @@ -1,29 +1,32 @@ { inputs, ... }: { - imports = [ inputs.flatpaks.homeManagerModules.declarative-flatpak ]; + imports = [ inputs.nix-flatpak.homeManagerModules.nix-flatpak ]; services.flatpak = { - remotes.flathub = "https://flathub.org/repo/flathub.flatpakrepo"; + uninstallUnmanaged = true; packages = [ - "flathub:app/md.obsidian.Obsidian//stable" - "flathub:app/com.github.iwalton3.jellyfin-media-player//stable" - "flathub:app/com.github.tchx84.Flatseal//stable" + "md.obsidian.Obsidian" + "com.github.iwalton3.jellyfin-media-player" + "com.github.tchx84.Flatseal" ]; overrides = { global = { - filesystems = [ - "~/.local/share/icons" - ]; - }; - "md.obsidian.Obsidian" = { - sockets = [ - "wayland" - "system-bus" - ]; - }; - "com.github.iwalton3.jellyfin-media-player" = { - sockets = [ - "!wayland" - ]; + Context = { + sockets = [ "wayland" "!x11" "!fallback-x11" ]; + filesystems = [ + "~/.local/share/fonts:ro" + "~/.icons:ro" + "/nix/store:ro" + ]; + }; }; + # "com.github.iwalton3.jellyfin-media-player".Context = { + # sockets = [ + # "!wayland" + # "x11" + # ]; + # devices = [ + # "dri" # GPU acceleration + # ]; + # }; }; }; }