diff options
Diffstat (limited to '')
| -rw-r--r-- | flake.lock | 245 | ||||
| -rw-r--r-- | flake.nix | 16 | ||||
| -rw-r--r-- | hm/jaki/default.nix | 3 | ||||
| -rw-r--r-- | hm/packages/default.nix | 9 | ||||
| -rw-r--r-- | hm/ssh/default.nix | 2 | ||||
| -rw-r--r-- | hm/swayidle/default.nix | 2 | ||||
| -rw-r--r-- | hm/waybar/default.nix | 8 | ||||
| -rw-r--r-- | modules/hm/jaki/default.nix | 1 | ||||
| -rw-r--r-- | modules/hm/jaki/firefox/default.nix | 2 | ||||
| -rw-r--r-- | modules/hm/jaki/freetube.nix | 16 | ||||
| -rw-r--r-- | modules/hm/jaki/theming.nix | 2 | ||||
| -rw-r--r-- | modules/hm/jaki/vscodium.nix | 2 | ||||
| -rw-r--r-- | modules/nixos/jaki/default.nix | 1 | ||||
| -rw-r--r-- | modules/nixos/jaki/monero.nix | 22 | ||||
| -rw-r--r-- | modules/nixos/jaki/nix.nix | 2 | ||||
| -rw-r--r-- | modules/nixos/jaki/roles.nix | 1 |
16 files changed, 131 insertions, 203 deletions
@@ -32,11 +32,11 @@ "arkenfox-user-js": { "flake": false, "locked": { - "lastModified": 1778605135, - "narHash": "sha256-+76DopMmUBZ5wJi2/BMCjC/nY2C8vXypX8JmBYEDycc=", + "lastModified": 1787195401, + "narHash": "sha256-t8WkesjL/pDyi23cqWeuC90KMzs89qOt3RczshI+6u4=", "owner": "arkenfox", "repo": "user.js", - "rev": "8fe9905c35a1025d1e6df69479f7625585fd956d", + "rev": "450f476a803b7d968269ebcd79b69e1041e0f0be", "type": "github" }, "original": { @@ -115,11 +115,11 @@ }, "crane": { "locked": { - "lastModified": 1781825982, - "narHash": "sha256-SlXKwIRIhrOSAcTjCB3ftPLzJWZStQIPS7J1FlZPnKk=", + "lastModified": 1787326676, + "narHash": "sha256-lWhBbBvC05/xwivKBBiM2YNizpmgqCgyOIzomvRuwxs=", "owner": "ipetkov", "repo": "crane", - "rev": "469fd08d0bcf6926321fa973c6777fbc87785dd7", + "rev": "692f7e9ef2ece8125b466f66f2af532b3edaed0d", "type": "github" }, "original": { @@ -151,11 +151,11 @@ "firefox-gnome-theme": { "flake": false, "locked": { - "lastModified": 1779670703, - "narHash": "sha256-UdfMivNMwCCqQsYDg5pSz8X2IOaOrIZLIIy+Bg3CO2o=", + "lastModified": 1783570805, + "narHash": "sha256-ptl5aRlCv9/uRSv2u8Hq8UFVFeZ6Q/bT049bpqNgc3w=", "owner": "rafaelmardojai", "repo": "firefox-gnome-theme", - "rev": "942159e73e40bf785816f7f1f5feed9ef3d7c8f9", + "rev": "5602ed62d638142c1ab31dccd01dfbfb28841225", "type": "github" }, "original": { @@ -180,22 +180,6 @@ "type": "github" } }, - "flake-compat_2": { - "flake": false, - "locked": { - "lastModified": 1767039857, - "narHash": "sha256-vNpUSpF5Nuw8xvDLj2KCwwksIbjua2LZCqhV1LNRDns=", - "owner": "NixOS", - "repo": "flake-compat", - "rev": "5edf11c44bc78a0d334f6334cdaf7d60d732daab", - "type": "github" - }, - "original": { - "owner": "NixOS", - "repo": "flake-compat", - "type": "github" - } - }, "flake-parts": { "inputs": { "nixpkgs-lib": [ @@ -203,11 +187,11 @@ ] }, "locked": { - "lastModified": 1778716662, - "narHash": "sha256-m1Yf0wZ8j1OHjTc2UwHwyQRSnNeSgLJOd7q5Y45hzi4=", + "lastModified": 1787559586, + "narHash": "sha256-onL0VLf9vPllmT0H/OlURIU5r5t5WIEl7t4tVNKT0Nw=", "owner": "hercules-ci", "repo": "flake-parts", - "rev": "f7c1a2d347e4c52d5fb8d10cb4d94b5884e546fb", + "rev": "9d0d87172c374f89da73c1cfe6d81ae62feac1f1", "type": "github" }, "original": { @@ -224,11 +208,11 @@ ] }, "locked": { - "lastModified": 1778716662, - "narHash": "sha256-m1Yf0wZ8j1OHjTc2UwHwyQRSnNeSgLJOd7q5Y45hzi4=", + "lastModified": 1782949081, + "narHash": "sha256-vp6Y/Grm98ESt6ceOkWiHWyZRDV3J1RID4w+6NWK9yA=", "owner": "hercules-ci", "repo": "flake-parts", - "rev": "f7c1a2d347e4c52d5fb8d10cb4d94b5884e546fb", + "rev": "17c9d6cdfc60c64f4ee8d306f9bc0b4ccb51481e", "type": "github" }, "original": { @@ -278,19 +262,16 @@ "flake-compat": [ "flake-compat" ], - "gitignore": [ - "gitignore" - ], "nixpkgs": [ "nixpkgs" ] }, "locked": { - "lastModified": 1781733627, - "narHash": "sha256-U3yTuGBnmXvXoQI3qkpfEDsn9RovQPAjN7ndRco+3u0=", + "lastModified": 1787424939, + "narHash": "sha256-O2tBn84NNuHrnqNVxx/XqsXwfYvS1YwBh+7CBnbCYsk=", "owner": "cachix", "repo": "git-hooks.nix", - "rev": "3bbec39bc90eadfa031e6f3b77272f3f60803e39", + "rev": "809414f0cdadf82cf11b06c2b29ba9b3168b3297", "type": "github" }, "original": { @@ -319,43 +300,23 @@ "type": "github" } }, - "gitignore_2": { - "inputs": { - "nixpkgs": [ - "lanzaboote", - "pre-commit", - "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" - } - }, "gnome-shell": { "flake": false, "locked": { - "lastModified": 1767737596, - "narHash": "sha256-eFujfIUQDgWnSJBablOuG+32hCai192yRdrNHTv0a+s=", + "host": "gitlab.gnome.org", + "lastModified": 1776175984, + "narHash": "sha256-RJFlFW8GiMei6oqUGrMkGEvVqOH8U7Q8abc1yK4VKD8=", "owner": "GNOME", "repo": "gnome-shell", - "rev": "ef02db02bf0ff342734d525b5767814770d85b49", - "type": "github" + "rev": "e0fdc4c13250e9a9b8ea9594c83925274f4a5dca", + "type": "gitlab" }, "original": { + "host": "gitlab.gnome.org", "owner": "GNOME", + "ref": "50.1", "repo": "gnome-shell", - "rev": "ef02db02bf0ff342734d525b5767814770d85b49", - "type": "github" + "type": "gitlab" } }, "home-manager": { @@ -365,11 +326,11 @@ ] }, "locked": { - "lastModified": 1782166451, - "narHash": "sha256-SA7LyrayyZBvtzZnesnSLV7haciFuVLeZaX2hd5v4j4=", + "lastModified": 1787715947, + "narHash": "sha256-jT6g5aWwA6TrIUJhqQ9ssm8W5e8vAl2Bv8gddEKKVNU=", "owner": "nix-community", "repo": "home-manager", - "rev": "471a1d2f840eb7fcbdfd541d99c13a64096f46db", + "rev": "7690127e7e1c90ab1dcaff525d0dafbeb7e14182", "type": "github" }, "original": { @@ -426,7 +387,9 @@ "nixpkgs": [ "nixpkgs" ], - "pre-commit": "pre-commit", + "pre-commit": [ + "git-hooks" + ], "rust-overlay": [ "rust-overlay" ] @@ -446,22 +409,6 @@ "type": "github" } }, - "libnbtplusplus": { - "flake": false, - "locked": { - "lastModified": 1772016279, - "narHash": "sha256-7itkptyjoRcXfGLwg1/jxajetZ3a4mDc66+w4X6yW8s=", - "owner": "PrismLauncher", - "repo": "libnbtplusplus", - "rev": "687e43031df0dc641984b4256bcca50d5b3f7de3", - "type": "github" - }, - "original": { - "owner": "PrismLauncher", - "repo": "libnbtplusplus", - "type": "github" - } - }, "nix-darwin": { "inputs": { "nixpkgs": [ @@ -469,11 +416,11 @@ ] }, "locked": { - "lastModified": 1781761792, - "narHash": "sha256-rCPytmKNjctLloB6UgK5CRrHSwV4b0ygxtJLPPp8R14=", + "lastModified": 1786845137, + "narHash": "sha256-oQFip+v0luP8NIxJzmiW4Wu8bILsbFWom5l0zonl8hQ=", "owner": "lnl7", "repo": "nix-darwin", - "rev": "a1fa429e945becaf60468600daf649be4ba0350c", + "rev": "4cff07de74b50e64bdd68cd4e722ab5b6b35ee48", "type": "github" }, "original": { @@ -521,11 +468,11 @@ "nixpkgs-lib": { "locked": { "dir": "lib", - "lastModified": 1781577229, - "narHash": "sha256-lrp67w8AulE9Ks53n27I45ADSzbOCn4H+CNW1Ck8B+8=", + "lastModified": 1787498568, + "narHash": "sha256-9i/VTdusq/+NM/tz+J1Re+ojkMB8MBf0QshnYfzHz30=", "owner": "NixOs", "repo": "nixpkgs", - "rev": "567a49d1913ce81ac6e9582e3553dd90a955875f", + "rev": "56c02bc00adcf003215cc4bd996d6efaf4cff188", "type": "github" }, "original": { @@ -570,11 +517,11 @@ }, "nixpkgs_2": { "locked": { - "lastModified": 1781577229, - "narHash": "sha256-lrp67w8AulE9Ks53n27I45ADSzbOCn4H+CNW1Ck8B+8=", + "lastModified": 1787498568, + "narHash": "sha256-9i/VTdusq/+NM/tz+J1Re+ojkMB8MBf0QshnYfzHz30=", "owner": "NixOs", "repo": "nixpkgs", - "rev": "567a49d1913ce81ac6e9582e3553dd90a955875f", + "rev": "56c02bc00adcf003215cc4bd996d6efaf4cff188", "type": "github" }, "original": { @@ -595,11 +542,11 @@ "systems": "systems" }, "locked": { - "lastModified": 1782160744, - "narHash": "sha256-cHC0CeygNx5y07oTyNo6Gkc0k3fD964MRvwQerlImPY=", + "lastModified": 1787691219, + "narHash": "sha256-CjeJTOjrluiDuL0W/YBFkSBOQjBYmdKwj7hWAJ4PIh0=", "owner": "nix-community", "repo": "nixvim", - "rev": "f60bf47332d1564a175ad4b517a83ff0c288f2e7", + "rev": "ebec1ae277a50b16e7d6682edd009ef585d68261", "type": "github" }, "original": { @@ -620,11 +567,11 @@ ] }, "locked": { - "lastModified": 1780281641, - "narHash": "sha256-M/+hUKoKbHXpV0xGVfELbN1Ds1aoe3pL5p5/t46YhVo=", + "lastModified": 1785549842, + "narHash": "sha256-DCwBZmGsySF7oKGTRgEv2HvpxVXkHT+38VhTM76k0B4=", "owner": "nix-community", "repo": "NUR", - "rev": "30f9ae2f04174de63ba8bcf3580ca90843b28a01", + "rev": "a9f987b57594e845e3e5cdd423b9a70846d70308", "type": "github" }, "original": { @@ -633,52 +580,6 @@ "type": "github" } }, - "pre-commit": { - "inputs": { - "flake-compat": "flake-compat_2", - "gitignore": "gitignore_2", - "nixpkgs": [ - "lanzaboote", - "nixpkgs" - ] - }, - "locked": { - "lastModified": 1781733627, - "narHash": "sha256-U3yTuGBnmXvXoQI3qkpfEDsn9RovQPAjN7ndRco+3u0=", - "owner": "cachix", - "repo": "pre-commit-hooks.nix", - "rev": "3bbec39bc90eadfa031e6f3b77272f3f60803e39", - "type": "github" - }, - "original": { - "owner": "cachix", - "repo": "pre-commit-hooks.nix", - "type": "github" - } - }, - "prismlauncher": { - "inputs": { - "libnbtplusplus": [ - "libnbtplusplus" - ], - "nixpkgs": [ - "nixpkgs" - ] - }, - "locked": { - "lastModified": 1781690232, - "narHash": "sha256-OX45Qq7O8oapL83vpV2+NXmcFqTy8Cb4hyqgaX5Xo5I=", - "owner": "PrismLauncher", - "repo": "PrismLauncher", - "rev": "f654ce821291b8b8db1f52850dec9e48ede1866f", - "type": "github" - }, - "original": { - "owner": "PrismLauncher", - "repo": "PrismLauncher", - "type": "github" - } - }, "ragenix": { "inputs": { "agenix": [ @@ -725,7 +626,6 @@ "home-manager": "home-manager", "impermanence": "impermanence", "lanzaboote": "lanzaboote", - "libnbtplusplus": "libnbtplusplus", "nix-darwin": "nix-darwin", "nix-github-actions": "nix-github-actions", "nixpkgs": "nixpkgs_2", @@ -733,7 +633,6 @@ "nixpkgs-pinned": "nixpkgs-pinned", "nixpkgs-stable": "nixpkgs-stable", "nixvim": "nixvim", - "prismlauncher": "prismlauncher", "ragenix": "ragenix", "rust-overlay": "rust-overlay", "sops-nix": "sops-nix", @@ -749,11 +648,11 @@ ] }, "locked": { - "lastModified": 1782098508, - "narHash": "sha256-YeBVH+avasLg/ZTOyshNI4qfU8p5RbMs9O8944A1QDg=", + "lastModified": 1787713867, + "narHash": "sha256-ZRYTEvDb8QZLCHRoMyIZle9V3Bvw905m0teeo1RvI7M=", "owner": "oxalica", "repo": "rust-overlay", - "rev": "67eed429b53d462923d9be580cfc9ed372f7564f", + "rev": "494680f9ffa2b4bf9f2df0f442c7096e44adfa00", "type": "github" }, "original": { @@ -769,11 +668,11 @@ ] }, "locked": { - "lastModified": 1782165805, - "narHash": "sha256-478kKQBvK6SYTOdN2h9jhKJv94nbXRbFMfuL1WshErg=", + "lastModified": 1786629091, + "narHash": "sha256-gkig4nPi1CWc4Z50GBsjE4ygSE7hMpl/TwID2an2Cck=", "owner": "Mic92", "repo": "sops-nix", - "rev": "56b24064fdcaedca53553b1a6d607fd23b613a24", + "rev": "a8627b21b9107c5711c96b84f32a9a4b3d45295f", "type": "github" }, "original": { @@ -802,11 +701,11 @@ "tinted-zed": "tinted-zed" }, "locked": { - "lastModified": 1781997134, - "narHash": "sha256-muBZG4O/agq/ljgHr6c3AsobIWgODAS6vf50xIS7o+Q=", + "lastModified": 1787175104, + "narHash": "sha256-tzNjlb0loxeWlipvxSNAUUihloeTZoyGFhEen87yM9k=", "owner": "danth", "repo": "stylix", - "rev": "a6a493119e492e15874caf6f7f8c7e572e64c655", + "rev": "a9e5a76a1b75b137f266e4f445e1eaba82e9783e", "type": "github" }, "original": { @@ -816,6 +715,7 @@ } }, "systems": { + "flake": false, "locked": { "lastModified": 1774449309, "narHash": "sha256-brhZ8DmuGtzkCYHJg4HEd602amKm89Y9ytsFZ5uWD1w=", @@ -833,15 +733,16 @@ }, "systems_2": { "locked": { - "lastModified": 1681028828, - "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=", + "lastModified": 1774449309, + "narHash": "sha256-brhZ8DmuGtzkCYHJg4HEd602amKm89Y9ytsFZ5uWD1w=", "owner": "nix-systems", "repo": "default", - "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e", + "rev": "c29398b59d2048c4ab79345812849c9bd15e9150", "type": "github" }, "original": { "owner": "nix-systems", + "ref": "future-26.11", "repo": "default", "type": "github" } @@ -880,11 +781,11 @@ "tinted-schemes": { "flake": false, "locked": { - "lastModified": 1777806186, - "narHash": "sha256-PDF0/wObw4nIsSBeXVYLsloXOiphXCgIdsrNcVXguKs=", + "lastModified": 1785153830, + "narHash": "sha256-fNdfCTeCXU3tZG3TMincd+u68qBHQgCr2Ljr/M1mWP0=", "owner": "tinted-theming", "repo": "schemes", - "rev": "0c94645546f4f3ddac77a1a5fce54eb95bf50795", + "rev": "9bd28ed313560db3c5b605c63bc4e309e78e3fc8", "type": "github" }, "original": { @@ -896,11 +797,11 @@ "tinted-tmux": { "flake": false, "locked": { - "lastModified": 1778379944, - "narHash": "sha256-wPDFzMGSlARlw0Sfsn48Q2+jPSfk6N0Ng6BC/d+7Q24=", + "lastModified": 1785031658, + "narHash": "sha256-mZp9O2LjzdMzlqQF3l3fjqsuPBzXy+1qTfBEUGjTlpk=", "owner": "tinted-theming", "repo": "tinted-tmux", - "rev": "fe0203a198690e71a5ff11e08812a4673de3678d", + "rev": "5d2c67f61ea7af36f16865ab6d541cdba41dc257", "type": "github" }, "original": { @@ -912,11 +813,11 @@ "tinted-zed": { "flake": false, "locked": { - "lastModified": 1778378178, - "narHash": "sha256-OXPXRIQgGwV77HjYRryOHguh4ALX96jkg+tseLkGgHA=", + "lastModified": 1785030526, + "narHash": "sha256-klZf8UviewRkxuu74Bhbq6tqy7oxebQC7UVRWbbtQxU=", "owner": "tinted-theming", "repo": "base16-zed", - "rev": "9cd816033ff969415b190722cddf134e78a5665f", + "rev": "16f5a8adf4a6b1310d0a61ab172de963e8f76a02", "type": "github" }, "original": { @@ -932,11 +833,11 @@ ] }, "locked": { - "lastModified": 1780220602, - "narHash": "sha256-eynAfOmbmxJnkp7YewvCEbShNnnYJ9gLLqkzsYtBPeM=", + "lastModified": 1786901030, + "narHash": "sha256-WSFCsDSE5ffgD2MqzkM2CYjeFiKhRF/dJUN8uedb6YE=", "owner": "numtide", "repo": "treefmt-nix", - "rev": "db947814a175b7ca6ded66e21383d938df01c227", + "rev": "27b3b12a8e6375f28ebe122f07d230ca5459bbfa", "type": "github" }, "original": { @@ -28,7 +28,6 @@ url = "github:cachix/git-hooks.nix"; inputs = { flake-compat.follows = "flake-compat"; - gitignore.follows = "gitignore"; nixpkgs.follows = "nixpkgs"; }; }; @@ -73,9 +72,7 @@ inputs = { crane.follows = "crane"; nixpkgs.follows = "nixpkgs"; - flake-compat.follows = "flake-compat"; - flake-parts.follows = "flake-parts"; - pre-commit-hooks-nix.follows = "git-hooks"; + pre-commit.follows = "git-hooks"; rust-overlay.follows = "rust-overlay"; }; }; @@ -120,17 +117,6 @@ nixpkgs.follows = "nixpkgs"; }; }; - prismlauncher = { - url = "github:PrismLauncher/PrismLauncher"; - inputs = { - libnbtplusplus.follows = "libnbtplusplus"; - nixpkgs.follows = "nixpkgs"; - }; - }; - libnbtplusplus = { - url = "github:PrismLauncher/libnbtplusplus"; - flake = false; - }; #wl-togglescreens = { # url = "git+https://git.project-insanity.org/onny/wl-togglescreens.git?ref=main"; # inputs.nixpkgs.follows = "nixpkgs"; diff --git a/hm/jaki/default.nix b/hm/jaki/default.nix index 5e12d4f..725e602 100644 --- a/hm/jaki/default.nix +++ b/hm/jaki/default.nix @@ -31,10 +31,11 @@ fastfetch.enable = true; firefox.enable = true; foot.enable = true; + freetube.enable = true; ghostty.enable = true; git.enable = true; hyfetch.enable = true; - hyprland.enable = true; + hyprland.enable = false; iamb.enable = true; jameica.enable = true; kdeconnect.enable = true; diff --git a/hm/packages/default.nix b/hm/packages/default.nix index 1e9a79f..9d6d889 100644 --- a/hm/packages/default.nix +++ b/hm/packages/default.nix @@ -1,7 +1,6 @@ { nixpkgs-pinned, pkgs, - prismlauncher, #wl-togglescreens, ... }: let @@ -41,7 +40,7 @@ in { hugo # ssg # wallpaper deamon - swww + awww networkmanagerapplet @@ -61,7 +60,7 @@ in { pdfarranger # gui for pdf arranging # LaTeX - texlive.combined.scheme-full # LaTeX + texliveFull # LaTeX texlab # latex language server pkgs-pinned.calibre # ebook management @@ -133,7 +132,7 @@ in { yambar swaylock swaybg # wallpaper - prismlauncher.packages.${pkgs.system}.prismlauncher # minecraft-launcher + prismlauncher # minecraft-launcher luanti # gameengine #wl-togglescreens.packages.${pkgs.system}.wl-togglescreens # toggle screens @@ -142,6 +141,8 @@ in { # soispha #grades.outputs.packages.${system}.default + + monero-cli ] ++ (with pkgs.kdePackages; [ okular # pdf viewer diff --git a/hm/ssh/default.nix b/hm/ssh/default.nix index d123a6a..6588a89 100644 --- a/hm/ssh/default.nix +++ b/hm/ssh/default.nix @@ -4,7 +4,7 @@ programs.ssh = { enable = true; enableDefaultConfig = false; - matchBlocks = let + settings = let genBox = user: { inherit user; hostname = "${user}.your-storagebox.de"; diff --git a/hm/swayidle/default.nix b/hm/swayidle/default.nix index 32befa2..597ba02 100644 --- a/hm/swayidle/default.nix +++ b/hm/swayidle/default.nix @@ -23,6 +23,6 @@ # resumeCommand = "${pkgs.hyprland}/bin/hyprctl dispatch dpms on"; #} ]; - systemdTarget = "hyprland-session.target"; + systemdTargets = ["hyprland-session.target"]; }; } diff --git a/hm/waybar/default.nix b/hm/waybar/default.nix index 0c14a8d..fb1088d 100644 --- a/hm/waybar/default.nix +++ b/hm/waybar/default.nix @@ -115,8 +115,8 @@ tooltip-format = '' <big>{:%Y %B}</big> <tt><small>{calendar}</small></tt>''; - format-alt = ''{:%d %m %Y}''; - format = ''{:%H %M}''; + format-alt = "{:%d %m %Y}"; + format = "{:%H %M}"; }; inhibitor = { what = [ @@ -124,7 +124,7 @@ "sleep" "handle-lid-switch" ]; - format = ''{icon}''; + format = "{icon}"; format-icons = { activated = ""; deactivated = ""; @@ -160,7 +160,7 @@ #style = ./style.css; systemd = { enable = true; - target = "hyprland-session.target"; + targets = ["hyprland-session.target"]; }; }; } diff --git a/modules/hm/jaki/default.nix b/modules/hm/jaki/default.nix index 675500f..1baead6 100644 --- a/modules/hm/jaki/default.nix +++ b/modules/hm/jaki/default.nix @@ -7,6 +7,7 @@ ./fastfetch.nix ./firefox ./foot.nix + ./freetube.nix ./ghostty.nix ./git.nix ./hyfetch.nix diff --git a/modules/hm/jaki/firefox/default.nix b/modules/hm/jaki/firefox/default.nix index cf447e4..6e45552 100644 --- a/modules/hm/jaki/firefox/default.nix +++ b/modules/hm/jaki/firefox/default.nix @@ -36,7 +36,7 @@ in { }; }; extraConfig = builtins.readFile "${user-js}/user.js"; - id = 1; + id = 0; isDefault = true; name = "default"; search = { diff --git a/modules/hm/jaki/freetube.nix b/modules/hm/jaki/freetube.nix new file mode 100644 index 0000000..536ffcb --- /dev/null +++ b/modules/hm/jaki/freetube.nix @@ -0,0 +1,16 @@ +{ + config, + lib, + ... +}: let + cfg = config.jaki.freetube; +in { + options.jaki.freetube = { + enable = lib.mkEnableOption "freetube"; + }; + config = lib.mkIf cfg.enable { + programs.freetube = { + enable = true; + }; + }; +} diff --git a/modules/hm/jaki/theming.nix b/modules/hm/jaki/theming.nix index a792a84..d64482b 100644 --- a/modules/hm/jaki/theming.nix +++ b/modules/hm/jaki/theming.nix @@ -10,7 +10,7 @@ in { config = lib.mkIf cfg.enable { stylix = { enable = true; - iconTheme = { + icons = { enable = true; dark = "Papirus-dark"; light = "Papirus-light"; diff --git a/modules/hm/jaki/vscodium.nix b/modules/hm/jaki/vscodium.nix index 99442af..79b2f08 100644 --- a/modules/hm/jaki/vscodium.nix +++ b/modules/hm/jaki/vscodium.nix @@ -8,7 +8,7 @@ in { options.jaki.vscodium.enable = lib.mkEnableOption "vscodium editor"; config = lib.mkIf cfg.enable { - programs.vscode = { + programs.vscodium = { enable = true; package = pkgs.vscodium; profiles.default.extensions = with pkgs.vscode-extensions; [ diff --git a/modules/nixos/jaki/default.nix b/modules/nixos/jaki/default.nix index db27868..bebe5f6 100644 --- a/modules/nixos/jaki/default.nix +++ b/modules/nixos/jaki/default.nix @@ -15,6 +15,7 @@ ./hyprland.nix ./impermanence.nix ./meta.nix + ./monero.nix ./networking.nix ./nix.nix ./pamconfig.nix diff --git a/modules/nixos/jaki/monero.nix b/modules/nixos/jaki/monero.nix new file mode 100644 index 0000000..ee670a2 --- /dev/null +++ b/modules/nixos/jaki/monero.nix @@ -0,0 +1,22 @@ +{ + config, + lib, + ... +}: let + cfg = config.jaki.monero; +in { + options.jaki.monero.enable = lib.mkEnableOption "monero"; + config = lib.mkIf cfg.enable { + services.monero = { + enable = true; + }; + environment.persistence."/srv".directories = [ + { + directory = config.services.monero.dataDir; + user = "monero"; + group = "monero"; + mode = "0755"; + } + ]; + }; +} diff --git a/modules/nixos/jaki/nix.nix b/modules/nixos/jaki/nix.nix index d946453..0edd642 100644 --- a/modules/nixos/jaki/nix.nix +++ b/modules/nixos/jaki/nix.nix @@ -39,11 +39,9 @@ in { commit-lockfile-summary = "flake.lock: update"; experimental-features = ["nix-command" "flakes"]; substituters = [ - "https://cache.garnix.io" "https://hyprland.cachix.org" ]; trusted-public-keys = [ - "cache.garnix.io:CTFPyKSLcx5RMJKfLo5EEPUObbA78b0YQ2DTCJXqr9g=" "hyprland.cachix.org-1:a7pgxzMz7+chwVL3/pzj6jIBMioiJM7ypFP8PwtkuGc=" ]; }; diff --git a/modules/nixos/jaki/roles.nix b/modules/nixos/jaki/roles.nix index d05a144..62eef7c 100644 --- a/modules/nixos/jaki/roles.nix +++ b/modules/nixos/jaki/roles.nix @@ -20,6 +20,7 @@ in { font.enable = lib.mkDefault true; hyprland.enable = lib.mkDefault true; impermanence.enable = lib.mkDefault true; + monero.enable = lib.mkDefault true; networking.enable = lib.mkDefault true; nix-config.enable = lib.mkDefault true; pamconfig.enable = lib.mkDefault true; |