diff --git a/flake.lock b/flake.lock index 49369ba..5ac75dc 100644 --- a/flake.lock +++ b/flake.lock @@ -1,5 +1,23 @@ { "nodes": { + "alqages": { + "inputs": { + "nixpkgs": ["nixpkgs"] + }, + "locked": { + "lastModified": 1739220907, + "narHash": "sha256-vGzQQxQw9uC6U8qxz26tvYz+VxgWFbJrRaAZsj1lQdA=", + "ref": "refs/heads/master", + "rev": "81f367e3aa49117b60822d313b93fafb2c44da44", + "revCount": 2, + "type": "git", + "url": "https://codeberg.org/amadaluzia/alqages.git" + }, + "original": { + "type": "git", + "url": "https://codeberg.org/amadaluzia/alqages.git" + } + }, "chaotic": { "inputs": { "fenix": "fenix", @@ -9,11 +27,11 @@ "nixpkgs": "nixpkgs" }, "locked": { - "lastModified": 1739040445, - "narHash": "sha256-GY24J4kpdrQlM9Ba5oCPKF8oJnwzic/lnY/0A+NtIJE=", + "lastModified": 1739212779, + "narHash": "sha256-7U7fOAOVy/AaOtw3HflnwEeXZJ9+ldxVU/Mx5tGN9A4=", "owner": "chaotic-cx", "repo": "nyx", - "rev": "a4c58e0ac0aaf1fb4e81e2c00df9c6bfd65eed6c", + "rev": "175a7f545d07bd08c14709f0d0849a8cddaaf460", "type": "github" }, "original": { @@ -66,11 +84,11 @@ "rust-analyzer-src": "rust-analyzer-src" }, "locked": { - "lastModified": 1738823732, - "narHash": "sha256-1NnSYno8qRN5zBF7xhaOn1WmC52qKBh7tEuRaDRFuMs=", + "lastModified": 1739082714, + "narHash": "sha256-cylMa750pId3Hqvzyurd86qJIYyyMWB0M7Gbh7ZB2tY=", "owner": "nix-community", "repo": "fenix", - "rev": "17bbc481e3d0cb52a605dd9316043c66ceaa17d7", + "rev": "e84058a7fe56aa01f2db19373cce190098494698", "type": "github" }, "original": { @@ -226,11 +244,11 @@ "nixpkgs": ["chaotic", "nixpkgs"] }, "locked": { - "lastModified": 1738841109, - "narHash": "sha256-sEgE3nifaRU5gfAx33ds0tx/j+qM0/5/bHopv/w6c0c=", + "lastModified": 1739051380, + "narHash": "sha256-p1QSLO8DJnANY+ppK7fjD8GqfCrEIDjso1CSRHsXL7Y=", "owner": "nix-community", "repo": "home-manager", - "rev": "f99c704fe3a4cf8d72b2d568ec80bc38be1a9407", + "rev": "5af1b9a0f193ab6138b89a8e0af8763c21bbf491", "type": "github" }, "original": { @@ -245,11 +263,11 @@ "nixpkgs": ["chaotic", "nixpkgs"] }, "locked": { - "lastModified": 1738656811, - "narHash": "sha256-z7Dzz713ueSQJYSdsWcH+D7o2pbq/sAl7/nBxru5oNA=", + "lastModified": 1738875499, + "narHash": "sha256-P3VbO2IkEW+0d0pJU7CuX8e+obSoiDw/YCVL1mnA26w=", "owner": "Jovian-Experiments", "repo": "Jovian-NixOS", - "rev": "cd9caf9afb1c8fe848f140a7831fe462b73df91a", + "rev": "4642ec1073a7417e6303484d8f2e7d29dc24a50f", "type": "github" }, "original": { @@ -3312,6 +3330,7 @@ }, "root": { "inputs": { + "alqages": "alqages", "chaotic": "chaotic", "disko": "disko", "flake-parts": "flake-parts", @@ -3343,11 +3362,11 @@ "rust-analyzer-src": { "flake": false, "locked": { - "lastModified": 1738754241, - "narHash": "sha256-hiw8wVE2tTrLPtIz1xSbJ3eEXCOx729kRq7UpMRTaU0=", + "lastModified": 1738997488, + "narHash": "sha256-jeNdFVtEDLypGIbNqBjURovfw9hMkVtlLR7j/5fRh54=", "owner": "rust-lang", "repo": "rust-analyzer", - "rev": "ca47cddc31ae76a05e8709ed4aec805c5ef741d3", + "rev": "208bc52b5dc177badc081c64eb0584a313c73242", "type": "github" }, "original": { @@ -3405,21 +3424,6 @@ "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" - } - }, "treefmt": { "inputs": { "nixpkgs": "nixpkgs_2" @@ -3439,16 +3443,12 @@ } }, "wallpkgs": { - "inputs": { - "nixpkgs": ["nixpkgs"], - "systems": "systems_3" - }, "locked": { - "lastModified": 1738760685, - "narHash": "sha256-S62Of2CyRhY62U5z/apIGLpFqh8gSXoXjY33CWbgRaU=", + "lastModified": 1739217766, + "narHash": "sha256-M3LYrVDpDypFY6gChungCZGNKc0mfLOf5zav3U1K+nE=", "owner": "notashelf", "repo": "wallpkgs", - "rev": "d5a23d13d469da55af20477b028b7b4391e7f7e5", + "rev": "6c0d1843ca6150b296fd13f1756113ffe036fa58", "type": "github" }, "original": { diff --git a/flake.nix b/flake.nix index 7ca44c4..69bb824 100644 --- a/flake.nix +++ b/flake.nix @@ -35,7 +35,6 @@ type = "github"; owner = "notashelf"; repo = "wallpkgs"; - inputs.nixpkgs.follows = "nixpkgs"; }; pankomacs = { type = "git"; @@ -59,9 +58,12 @@ type = "git"; url = "https://codeberg.org/amadaluzia/hetch.git"; ref = "master"; - inputs = { - nixpkgs.follows = "nixpkgs"; - }; + inputs.nixpkgs.follows = "nixpkgs"; + }; + alqages = { + type = "git"; + url = "https://codeberg.org/amadaluzia/alqages.git"; + inputs.nixpkgs.follows = "nixpkgs"; }; }; outputs = inputs @ {flake-parts, ...}: diff --git a/hosts/python/apps.nix b/hosts/python/apps.nix index 8b71284..dcabf6f 100644 --- a/hosts/python/apps.nix +++ b/hosts/python/apps.nix @@ -12,17 +12,19 @@ statix deadnix alejandra + neovide + neovim ; - neovim = inputs.painless-neovim.packages.${pkgs.system}.default; + # neovim = inputs.painless-neovim.packages.${pkgs.system}.default; }; - sessionVariables = {EDITOR = "emacs";}; + sessionVariables = {EDITOR = "neovide --no-fork";}; }; alqueva = { programs = { swaybg = { enable = true; - wallpaper = inputs.wallpkgs.wallpapers.nord-05.path; + wallpaper = inputs.wallpkgs.wallpapers.nord-manInStreet.path; }; waybar = { enable = true; @@ -66,13 +68,6 @@ web.enable = false; }; rsyncd.enable = true; - emacs = { - enable = true; - package = inputs.pankomacs.lib.mkEmacs { - inherit pkgs; - emacs = pkgs.emacs29-pgtk; - }; - }; }; nix.gc.automatic = lib.mkForce false; diff --git a/hosts/python/default.nix b/hosts/python/default.nix index 678cc56..132b298 100644 --- a/hosts/python/default.nix +++ b/hosts/python/default.nix @@ -1,7 +1,10 @@ -{pkgs, ...}: { +{ + pkgs, + inputs, + ... +}: { imports = [ ./users - ./wrappers ./hardware.nix ./disks.nix ./theme.nix @@ -18,6 +21,18 @@ }; }; + nixpkgs.overlays = [ + inputs.alqages.overlays.default + ( + final: _prev: ( + builtins.mapAttrs (_: v: final.callPackage v {}) { + amadaluzian-waybar = ./wrappers/waybar; + amadaluzian-foot = ./wrappers/foot; + } + ) + ) + ]; + console = { font = "Lat2-Terminus16"; keyMap = "us"; diff --git a/hosts/python/theme.nix b/hosts/python/theme.nix index bcc74ef..28f0a3a 100644 --- a/hosts/python/theme.nix +++ b/hosts/python/theme.nix @@ -4,7 +4,7 @@ themeVariants = ["purple"]; tweaks = ["nord"]; }; - icon-theme = pkgs.colloid-icon-theme.override { + icon-theme = pkgs.colloid-icon-theme-git.override { schemeVariants = ["nord"]; colorVariants = ["purple"]; }; diff --git a/hosts/python/users/configs/niri/config.kdl b/hosts/python/users/configs/niri/config.kdl index 27a441c..bdc6959 100644 --- a/hosts/python/users/configs/niri/config.kdl +++ b/hosts/python/users/configs/niri/config.kdl @@ -293,7 +293,7 @@ binds { Mod+Shift+Slash { show-hotkey-overlay; } // Suggested binds for running programs: terminal, app launcher, screen locker. - Mod+T { spawn "foot"; } + Mod+T { spawn "neovide"; } Mod+D { spawn "rofi" "-show" "drun"; } // Super+Alt+L { spawn "swaylock"; } @@ -510,4 +510,4 @@ binds { cursor { xcursor-theme "Simp1e-Nord-Dark" xcursor-size 24 -} \ No newline at end of file +} diff --git a/hosts/python/users/default.nix b/hosts/python/users/default.nix index e1dbd69..e9435e1 100644 --- a/hosts/python/users/default.nix +++ b/hosts/python/users/default.nix @@ -9,8 +9,8 @@ ".config/qutebrowser/config.py" = ./configs/qutebrowser/config.py; ".config/qutebrowser/theme" = ./configs/qutebrowser/theme; ".config/vesktop/themes/theme.user.css" = pkgs.fetchurl { - url = "https://raw.githubusercontent.com/BitsExploited/archHypr_dotfiles/refs/heads/main/discord-theme/nord.theme.css"; - hash = "sha256-OSw0v1iVn639eSZB9xcqy1QOPRtb+8c4IVUZvr+TC/I="; + url = "https://raw.githubusercontent.com/deathbeam/base16-discord/refs/heads/main/themes/base16-nord.theme.css"; + hash = "sha256-LofqgsVl+XKisk/dmb/PpwuLEWdEgchIfIw4xZs6LQw="; }; ".config/vesktop/settings/quickCss.css" = ./configs/vesktop/quickCss.css; ".config/kanshi/" = ./configs/kanshi; @@ -22,12 +22,12 @@ inherit (pkgs) wget - vesktop + vesktop-electron32 mpv imv amberol fractal - nicotine-plus + nicotine-plus-libadwaita nautilus librewolf playerctl diff --git a/hosts/python/wrappers/default.nix b/hosts/python/wrappers/default.nix index 1fd3e71..ea8f50d 100644 --- a/hosts/python/wrappers/default.nix +++ b/hosts/python/wrappers/default.nix @@ -1,10 +1,2 @@ -{ - nixpkgs.overlays = [ - ( - final: _prev: { - amadaluzian-waybar = final.callPackage ./waybar {}; - amadaluzian-foot = final.callPackage ./foot {}; - } - ) - ]; +{...}: { } diff --git a/lib/default.nix b/lib/default.nix index a3ce64c..4bacfb5 100644 --- a/lib/default.nix +++ b/lib/default.nix @@ -33,9 +33,6 @@ rebs = "nixos-rebuild --use-remote-sudo switch --flake .#${host}"; rebt = "nixos-rebuild --use-remote-sudo test --flake .#${host}"; }; - nixpkgs.overlays = [ - inputs.self.overlays.default - ]; networking.hostName = host; systemd.oomd = { enableRootSlice = true;