diff --git a/flake.lock b/flake.lock index 7affb4d..922f87a 100644 --- a/flake.lock +++ b/flake.lock @@ -1,12 +1,23 @@ { "nodes": { "catppuccin": { + "inputs": { + "catppuccin-v1_1": "catppuccin-v1_1", + "catppuccin-v1_2": "catppuccin-v1_2", + "home-manager": "home-manager", + "home-manager-stable": "home-manager-stable", + "nixpkgs": [ + "nixpkgs" + ], + "nixpkgs-stable": "nixpkgs-stable", + "nuscht-search": "nuscht-search" + }, "locked": { - "lastModified": 1734734291, - "narHash": "sha256-CFX4diEQHKvZYjnhf7TLg20m3ge1O4vqgplsk/Kuaek=", + "lastModified": 1736069220, + "narHash": "sha256-76MaB3COao55nlhWmSmq9PKgu2iGIs54C1cAE0E5J6Y=", "owner": "catppuccin", "repo": "nix", - "rev": "1e4c3803b8da874ff75224ec8512cb173036bbd8", + "rev": "8eada392fd6571a747e1c5fc358dd61c14c8704e", "type": "github" }, "original": { @@ -15,7 +26,51 @@ "type": "github" } }, + "catppuccin-v1_1": { + "locked": { + "lastModified": 1734055249, + "narHash": "sha256-pCWJgwo77KD7EJpwynwKrWPZ//dwypHq2TfdzZWqK68=", + "rev": "7221d6ca17ac36ed20588e1c3a80177ac5843fa7", + "revCount": 326, + "type": "tarball", + "url": "https://api.flakehub.com/f/pinned/catppuccin/nix/1.1.1/0193bdc0-b045-7eed-bbec-95611a8ecdf5/source.tar.gz" + }, + "original": { + "type": "tarball", + "url": "https://flakehub.com/f/catppuccin/nix/1.1.%2A.tar.gz" + } + }, + "catppuccin-v1_2": { + "locked": { + "lastModified": 1734728407, + "narHash": "sha256-Let3uJo4YDyfqbqaw66dpZxhJB2TrDyZWSFd5rpPLJA=", + "rev": "23ee86dbf4ed347878115a78971d43025362fab1", + "revCount": 341, + "type": "tarball", + "url": "https://api.flakehub.com/f/pinned/catppuccin/nix/1.2.0/0193e5e0-33b7-7149-a362-bfe56b20f64e/source.tar.gz" + }, + "original": { + "type": "tarball", + "url": "https://flakehub.com/f/catppuccin/nix/1.2.%2A.tar.gz" + } + }, "flake-compat": { + "flake": false, + "locked": { + "lastModified": 1696426674, + "narHash": "sha256-kvjfFW7WAETZlt09AgDn1MrtKzP7t90Vf7vypd3OL1U=", + "owner": "edolstra", + "repo": "flake-compat", + "rev": "0f9255e01c2351cc7d116c072cb317785dd33b33", + "type": "github" + }, + "original": { + "owner": "edolstra", + "repo": "flake-compat", + "type": "github" + } + }, + "flake-compat_2": { "flake": false, "locked": { "lastModified": 1650374568, @@ -36,11 +91,11 @@ "systems": "systems" }, "locked": { - "lastModified": 1694529238, - "narHash": "sha256-zsNZZGTGnMOf9YpHKJqMSsa0dXbfmxeoJ7xHlrt+xmY=", + "lastModified": 1731533236, + "narHash": "sha256-l0KFg5HjrsfsO/JpG+r7fRrqm12kzFHyUHqHCVpMMbI=", "owner": "numtide", "repo": "flake-utils", - "rev": "ff7b65b44d01cf9ba6a71320833626af21126384", + "rev": "11707dc2f618dd54ca8739b309ec4fc024de578b", "type": "github" }, "original": { @@ -51,7 +106,7 @@ }, "flake-utils-plus": { "inputs": { - "flake-utils": "flake-utils" + "flake-utils": "flake-utils_3" }, "locked": { "lastModified": 1715533576, @@ -68,13 +123,70 @@ "type": "github" } }, + "flake-utils_2": { + "inputs": { + "systems": "systems_2" + }, + "locked": { + "lastModified": 1705309234, + "narHash": "sha256-uNRRNRKmJyCRC/8y1RqBkqWBLM034y4qN7EprSdmgyA=", + "owner": "numtide", + "repo": "flake-utils", + "rev": "1ef2e671c3b0c19053962c07dbda38332dcebf26", + "type": "github" + }, + "original": { + "owner": "numtide", + "repo": "flake-utils", + "type": "github" + } + }, + "flake-utils_3": { + "inputs": { + "systems": "systems_3" + }, + "locked": { + "lastModified": 1694529238, + "narHash": "sha256-zsNZZGTGnMOf9YpHKJqMSsa0dXbfmxeoJ7xHlrt+xmY=", + "owner": "numtide", + "repo": "flake-utils", + "rev": "ff7b65b44d01cf9ba6a71320833626af21126384", + "type": "github" + }, + "original": { + "owner": "numtide", + "repo": "flake-utils", + "type": "github" + } + }, + "ghostty": { + "inputs": { + "flake-compat": "flake-compat", + "nixpkgs-stable": "nixpkgs-stable_2", + "nixpkgs-unstable": "nixpkgs-unstable", + "zig": "zig" + }, + "locked": { + "lastModified": 1736402835, + "narHash": "sha256-SiG2B2KfU4BIOggrJJa9nKoagXtLXWWo9vXJ88a+ls8=", + "owner": "ghostty-org", + "repo": "ghostty", + "rev": "2d7706ec4f7042b9072d3b8ac8ea496dee209bc8", + "type": "github" + }, + "original": { + "owner": "ghostty-org", + "repo": "ghostty", + "type": "github" + } + }, "hardware": { "locked": { - "lastModified": 1734954597, - "narHash": "sha256-QIhd8/0x30gEv8XEE1iAnrdMlKuQ0EzthfDR7Hwl+fk=", + "lastModified": 1736283893, + "narHash": "sha256-BG1FfTexFwNty5VhYjaQLMR6CMPfI3QRcaZrFQYu2EM=", "owner": "NixOS", "repo": "nixos-hardware", - "rev": "def1d472c832d77885f174089b0d34854b007198", + "rev": "4f339f6be2b61662f957c2ee9eda0fa597d8a6d6", "type": "github" }, "original": { @@ -87,15 +199,16 @@ "home-manager": { "inputs": { "nixpkgs": [ + "catppuccin", "nixpkgs" ] }, "locked": { - "lastModified": 1734944412, - "narHash": "sha256-36QfCAl8V6nMIRUCgiC79VriJPUXXkHuR8zQA1vAtSU=", + "lastModified": 1734622215, + "narHash": "sha256-OOfI0XhSJGHblfdNDhfnn8QnZxng63rWk9eeJ2tCbiI=", "owner": "nix-community", "repo": "home-manager", - "rev": "8264bfe3a064d704c57df91e34b795b6ac7bad9e", + "rev": "1395379a7a36e40f2a76e7b9936cc52950baa1be", "type": "github" }, "original": { @@ -104,6 +217,76 @@ "type": "github" } }, + "home-manager-stable": { + "inputs": { + "nixpkgs": [ + "catppuccin", + "nixpkgs-stable" + ] + }, + "locked": { + "lastModified": 1734366194, + "narHash": "sha256-vykpJ1xsdkv0j8WOVXrRFHUAdp9NXHpxdnn1F4pYgSw=", + "owner": "nix-community", + "repo": "home-manager", + "rev": "80b0fdf483c5d1cb75aaad909bd390d48673857f", + "type": "github" + }, + "original": { + "owner": "nix-community", + "ref": "release-24.11", + "repo": "home-manager", + "type": "github" + } + }, + "home-manager_2": { + "inputs": { + "nixpkgs": [ + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1736366465, + "narHash": "sha256-Fo68EF6p/N9GJyHiAUbXtiE7IJlb3IMjK86LuxFMsRU=", + "owner": "nix-community", + "repo": "home-manager", + "rev": "7e00856596891850ba5ad4c5ecd2ed74468c08c5", + "type": "github" + }, + "original": { + "owner": "nix-community", + "repo": "home-manager", + "type": "github" + } + }, + "ixx": { + "inputs": { + "flake-utils": [ + "catppuccin", + "nuscht-search", + "flake-utils" + ], + "nixpkgs": [ + "catppuccin", + "nuscht-search", + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1729958008, + "narHash": "sha256-EiOq8jF4Z/zQe0QYVc3+qSKxRK//CFHMB84aYrYGwEs=", + "owner": "NuschtOS", + "repo": "ixx", + "rev": "9fd01aad037f345350eab2cd45e1946cc66da4eb", + "type": "github" + }, + "original": { + "owner": "NuschtOS", + "ref": "v0.0.6", + "repo": "ixx", + "type": "github" + } + }, "nix-flatpak": { "locked": { "lastModified": 1711997201, @@ -122,11 +305,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1734820311, - "narHash": "sha256-YsLK4ZiGY5CZmmgzsfU76OHVUTDeZJgirKzNO+et0UQ=", + "lastModified": 1736241350, + "narHash": "sha256-CHd7yhaDigUuJyDeX0SADbTM9FXfiWaeNyY34FL1wQU=", "owner": "nixos", "repo": "nixpkgs", - "rev": "7e4a1594489d41bf8e16046b28e14a0e264c9baa", + "rev": "8c9fd3e564728e90829ee7dbac6edc972971cd0f", "type": "github" }, "original": { @@ -136,27 +319,83 @@ "type": "github" } }, - "nixpkgs_2": { + "nixpkgs-stable": { "locked": { - "lastModified": 1734424634, - "narHash": "sha256-cHar1vqHOOyC7f1+tVycPoWTfKIaqkoe1Q6TnKzuti4=", + "lastModified": 1734600368, + "narHash": "sha256-nbG9TijTMcfr+au7ZVbKpAhMJzzE2nQBYmRvSdXUD8g=", + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "b47fd6fa00c6afca88b8ee46cfdb00e104f50bca", + "type": "github" + }, + "original": { + "owner": "NixOS", + "ref": "nixos-24.11", + "repo": "nixpkgs", + "type": "github" + } + }, + "nixpkgs-stable_2": { + "locked": { + "lastModified": 1733423277, + "narHash": "sha256-TxabjxEgkNbCGFRHgM/b9yZWlBj60gUOUnRT/wbVQR8=", "owner": "nixos", "repo": "nixpkgs", - "rev": "d3c42f187194c26d9f0309a8ecc469d6c878ce33", + "rev": "e36963a147267afc055f7cf65225958633e536bf", "type": "github" }, "original": { "owner": "nixos", - "ref": "nixos-unstable", + "ref": "release-24.11", "repo": "nixpkgs", "type": "github" } }, + "nixpkgs-unstable": { + "locked": { + "lastModified": 1733229606, + "narHash": "sha256-FLYY5M0rpa5C2QAE3CKLYAM6TwbKicdRK6qNrSHlNrE=", + "owner": "nixos", + "repo": "nixpkgs", + "rev": "566e53c2ad750c84f6d31f9ccb9d00f823165550", + "type": "github" + }, + "original": { + "owner": "nixos", + "ref": "nixpkgs-unstable", + "repo": "nixpkgs", + "type": "github" + } + }, + "nuscht-search": { + "inputs": { + "flake-utils": "flake-utils", + "ixx": "ixx", + "nixpkgs": [ + "catppuccin", + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1733773348, + "narHash": "sha256-Y47y+LesOCkJaLvj+dI/Oa6FAKj/T9sKVKDXLNsViPw=", + "owner": "NuschtOS", + "repo": "search", + "rev": "3051be7f403bff1d1d380e4612f0c70675b44fc9", + "type": "github" + }, + "original": { + "owner": "NuschtOS", + "repo": "search", + "type": "github" + } + }, "root": { "inputs": { "catppuccin": "catppuccin", + "ghostty": "ghostty", "hardware": "hardware", - "home-manager": "home-manager", + "home-manager": "home-manager_2", "nix-flatpak": "nix-flatpak", "nixpkgs": "nixpkgs", "snowfall-lib": "snowfall-lib", @@ -166,18 +405,18 @@ }, "snowfall-lib": { "inputs": { - "flake-compat": "flake-compat", + "flake-compat": "flake-compat_2", "flake-utils-plus": "flake-utils-plus", "nixpkgs": [ "nixpkgs" ] }, "locked": { - "lastModified": 1732544274, - "narHash": "sha256-qvzLIxuqukl0nxpXHEh5+iw1BLeLxYOwRC0+7cFUbPo=", + "lastModified": 1736130495, + "narHash": "sha256-4i9nAJEZFv7vZMmrE0YG55I3Ggrtfo5/T07JEpEZ/RM=", "owner": "snowfallorg", "repo": "lib", - "rev": "cfeacd055545ab5de0ecfd41e09324dcd8fb2bbb", + "rev": "02d941739f98a09e81f3d2d9b3ab08918958beac", "type": "github" }, "original": { @@ -193,11 +432,11 @@ ] }, "locked": { - "lastModified": 1734546875, - "narHash": "sha256-6OvJbqQ6qPpNw3CA+W8Myo5aaLhIJY/nNFDk3zMXLfM=", + "lastModified": 1736203741, + "narHash": "sha256-eSjkBwBdQk+TZWFlLbclF2rAh4JxbGg8az4w/Lfe7f4=", "owner": "Mic92", "repo": "sops-nix", - "rev": "ed091321f4dd88afc28b5b4456e0a15bd8374b4d", + "rev": "c9c88f08e3ee495e888b8d7c8624a0b2519cb773", "type": "github" }, "original": { @@ -221,16 +460,48 @@ "type": "github" } }, + "systems_2": { + "locked": { + "lastModified": 1681028828, + "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=", + "owner": "nix-systems", + "repo": "default", + "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e", + "type": "github" + }, + "original": { + "owner": "nix-systems", + "repo": "default", + "type": "github" + } + }, + "systems_3": { + "locked": { + "lastModified": 1681028828, + "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=", + "owner": "nix-systems", + "repo": "default", + "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e", + "type": "github" + }, + "original": { + "owner": "nix-systems", + "repo": "default", + "type": "github" + } + }, "zen-browser": { "inputs": { - "nixpkgs": "nixpkgs_2" + "nixpkgs": [ + "nixpkgs" + ] }, "locked": { - "lastModified": 1734657663, - "narHash": "sha256-1Et05foPKYyWAHUftrrzWgfddnd0r0sm2WCuNeVDDkA=", + "lastModified": 1736267677, + "narHash": "sha256-7FH/gFShKOzf46yKqA4VWAaWxuyHBRnXOdaffbTxVo4=", "owner": "0xc000022070", "repo": "zen-browser-flake", - "rev": "f5181bde713d1aa5c8d95d00f4f47cd937d2b3e8", + "rev": "c96c6a1ebf1bea782f9528dc316d986a6087ebc0", "type": "github" }, "original": { @@ -238,6 +509,31 @@ "repo": "zen-browser-flake", "type": "github" } + }, + "zig": { + "inputs": { + "flake-compat": [ + "ghostty" + ], + "flake-utils": "flake-utils_2", + "nixpkgs": [ + "ghostty", + "nixpkgs-stable" + ] + }, + "locked": { + "lastModified": 1717848532, + "narHash": "sha256-d+xIUvSTreHl8pAmU1fnmkfDTGQYCn2Rb/zOwByxS2M=", + "owner": "mitchellh", + "repo": "zig-overlay", + "rev": "02fc5cc555fc14fda40c42d7c3250efa43812b43", + "type": "github" + }, + "original": { + "owner": "mitchellh", + "repo": "zig-overlay", + "type": "github" + } } }, "root": "root", diff --git a/flake.nix b/flake.nix index 50737cf..8810110 100644 --- a/flake.nix +++ b/flake.nix @@ -6,41 +6,26 @@ nixpkgs.url = "github:nixos/nixpkgs/nixpkgs-unstable"; # Snowfall lib imposes an opinionated file-structure, which makes things a little easier sometimes. - snowfall-lib = { - url = "github:snowfallorg/lib"; - inputs.nixpkgs.follows = "nixpkgs"; - }; + snowfall-lib = { url = "github:snowfallorg/lib"; inputs.nixpkgs.follows = "nixpkgs"; }; # Secret management tool - sops-nix = { - url = "github:Mic92/sops-nix"; - inputs.nixpkgs.follows = "nixpkgs"; - }; + sops-nix = { url = "github:Mic92/sops-nix"; inputs.nixpkgs.follows = "nixpkgs"; }; # Home manager for managing the /home directory. - home-manager = { - url = "github:nix-community/home-manager"; - inputs.nixpkgs.follows = "nixpkgs"; - }; + home-manager = { url = "github:nix-community/home-manager"; inputs.nixpkgs.follows = "nixpkgs"; }; # Hardware specific tweaks and performance optimizations. - hardware = { - url = "github:NixOS/nixos-hardware/master"; - }; + hardware = { url = "github:NixOS/nixos-hardware/master"; }; # Catppuccin theme nix configuration. - catppuccin = { - url = "github:catppuccin/nix"; - }; + catppuccin = { url = "github:catppuccin/nix"; inputs.nixpkgs.follows = "nixpkgs"; }; # Declarative management of Flatpak packages. - nix-flatpak = { - url = "github:gmodena/nix-flatpak/?ref=v0.4.1"; - }; + nix-flatpak = { url = "github:gmodena/nix-flatpak/?ref=v0.4.1"; }; - zen-browser = { - url = "github:0xc000022070/zen-browser-flake"; - }; + # Apps + zen-browser = { url = "github:0xc000022070/zen-browser-flake"; inputs.nixpkgs.follows = "nixpkgs"; }; + ghostty = { url = "github:ghostty-org/ghostty"; }; }; nixConfig = { diff --git a/homes/x86_64-linux/jo@puzzlevision/default.nix b/homes/x86_64-linux/jo@puzzlevision/default.nix index c5a16a5..7a195fd 100644 --- a/homes/x86_64-linux/jo@puzzlevision/default.nix +++ b/homes/x86_64-linux/jo@puzzlevision/default.nix @@ -8,7 +8,6 @@ puzzlevision = { themes.catppuccin = { gtk.enable = true; - black-box.enable = true; }; }; @@ -44,6 +43,7 @@ avra avrdude jetbrains.phpstorm + jetbrains-toolbox git nodejs_22 bun diff --git a/modules/home/desktop/gnome/default.nix b/modules/home/desktop/gnome/default.nix index 523ad09..4864099 100644 --- a/modules/home/desktop/gnome/default.nix +++ b/modules/home/desktop/gnome/default.nix @@ -39,10 +39,10 @@ in }; }; blur-my-shell = { - enable-blur = mkOpt bool true "Whether to enable blur-my-shell application blur."; + enable-blur = mkOpt bool false "Whether to enable blur-my-shell application blur."; }; }; - wallpaper = mkOpt str (builtins.toString ./wallpapers/car-wreck.png) "Specify the path of your prefered Gnome wallpaper."; + wallpaper = mkOpt str (builtins.toString ./wallpapers/abstract/amber-d.jxl) "Specify the path of your prefered Gnome wallpaper."; }; config = mkIf osConfig.${namespace}.desktop.gnome.enable { @@ -80,98 +80,9 @@ in picture-uri = cfg.wallpaper; picture-uri-dark = cfg.wallpaper; }; + "org/gnome/desktop/interface" = { + color-scheme = "prefer-dark"; + }; }; - - home.file.".local/share/themes/catppuccin-macchiato/gnome-shell/gnome-shell.css".text = '' - #panel { - - /*background-color: #131313;*/ - - background-color: rgba(0, 0, 0, 0); - - /*background-color: transparent;*/ - - font-weight: bold; - - /*height: 2.2em;*/ - - height: 2.3em; - - transition-duration: 250ms; - - /*Custom panel settings */ - - /*margin: 5px 35px 0 35px;*/ - - margin: 5px 22px 0 22px; - - border-radius: 10px; - - #panel .panel-button { - - background-color: rgba(19, 19, 19, 0.8); - - font-weight: bold; - - /*color: #f2f2f2;*/ - - /*color: #131313;*/ - - -natural-hpadding: 12px; - - -minimum-hpadding: 6px; - - transition-duration: 150ms; - - border: 0px solid transparent; - - /*border: none;*/ - - /*border-radius: 99px;*/ - - border-radius: 10px; - - /*margin: 5px;*/ - - margin-left: 5px; - - margin-right: 5px; - - #panel .panel-button:active, - - #panel .panel-button:overview, - - #panel .panel-button:focus, - - #panel .panel-button:checked { - - box-shadow: inset 0 0 0 100px rgba(242, 242, 242, 0.2); - - /*background-color: #8c7feb;*/ - - background-color: #b299d1; - - /*background-color: #b299d1;*/ - - /*color: #8c7feb;*/ - - color: #131313; - - /*background-color: rgba(163, 153, 235, 1);*/ - - } - - #panel .panel-button:hover { - - box-shadow: inset 0 0 0 100px rgba(242, 242, 242, 0.15); - - background-color: #a399eb; - - color: #131313; - - /*box-shadow: inset 0 0 0 100px rgba(183, 176, 235, 0.15);*/ - - } - ''; }; } diff --git a/modules/home/desktop/gnome/wallpapers/abstract/amber-d.jxl b/modules/home/desktop/gnome/wallpapers/abstract/amber-d.jxl new file mode 100644 index 0000000..1938c12 Binary files /dev/null and b/modules/home/desktop/gnome/wallpapers/abstract/amber-d.jxl differ diff --git a/modules/home/desktop/gnome/wallpapers/abstract/amber-l.jxl b/modules/home/desktop/gnome/wallpapers/abstract/amber-l.jxl new file mode 100644 index 0000000..decf85d Binary files /dev/null and b/modules/home/desktop/gnome/wallpapers/abstract/amber-l.jxl differ diff --git a/modules/nixos/common/audio/default.nix b/modules/nixos/common/audio/default.nix index 3528bb8..a117a1b 100644 --- a/modules/nixos/common/audio/default.nix +++ b/modules/nixos/common/audio/default.nix @@ -10,7 +10,7 @@ in { options.${namespace}.common.audio = { enable = mkEnableOption "whether to enable common audio support and tweaks"; }; config = mkIf cfg.enable { - hardware.pulseaudio.enable = false; + services.pulseaudio.enable = false; security.rtkit.enable = true; services.pipewire = { diff --git a/modules/nixos/common/bluetooth/default.nix b/modules/nixos/common/bluetooth/default.nix index 38cdbff..2271e8b 100644 --- a/modules/nixos/common/bluetooth/default.nix +++ b/modules/nixos/common/bluetooth/default.nix @@ -11,7 +11,7 @@ in { options.${namespace}.common.bluetooth = { enable = mkEnableOption "Enable bluetooth support on your current system"; }; config = mkIf cfg.enable { - environment.systemPackages = with pkgs; [ bluez blueman ]; + environment.systemPackages = with pkgs; [ bluez ]; hardware.bluetooth = { enable = true; diff --git a/modules/nixos/common/networking/default.nix b/modules/nixos/common/networking/default.nix index 03f3c34..383dd96 100644 --- a/modules/nixos/common/networking/default.nix +++ b/modules/nixos/common/networking/default.nix @@ -15,7 +15,6 @@ in { config = mkIf cfg.enable { networking.networkmanager = { enable = true; - wifi.powersave = false; }; }; } diff --git a/systems/x86_64-linux/puzzlevision/default.nix b/systems/x86_64-linux/puzzlevision/default.nix index b79807e..8e6a8ea 100644 --- a/systems/x86_64-linux/puzzlevision/default.nix +++ b/systems/x86_64-linux/puzzlevision/default.nix @@ -79,7 +79,8 @@ environment.systemPackages = with pkgs; [ ### General nano - inputs.zen-browser.packages."${system}".specific + inputs.zen-browser.packages."${system}".default + inputs.ghostty.packages.x86_64-linux.default vlc ## Security