diff --git a/flake.lock b/flake.lock index 67a5ce2..bb526cc 100644 --- a/flake.lock +++ b/flake.lock @@ -20,18 +20,36 @@ "type": "github" } }, + "htt-src": { + "inputs": { + "nixpkgs": "nixpkgs" + }, + "locked": { + "lastModified": 1775834362, + "narHash": "sha256-JwVeElcwMiEFSfqjqS6RFDr1y8ZqKLUQ9Qq+I3yNnsI=", + "ref": "refs/heads/master", + "rev": "a91cd16bbe1095777f0a6999d5f2cc024cc02818", + "revCount": 54, + "type": "git", + "url": "ssh://gitea@typofelho.ddns.net/TypoMustakes/hyprland-toggle-tiling.git" + }, + "original": { + "type": "git", + "url": "ssh://gitea@typofelho.ddns.net/TypoMustakes/hyprland-toggle-tiling.git" + } + }, "nixpkgs": { "locked": { - "lastModified": 1775525138, - "narHash": "sha256-BQb70+B378ECLO8iQT3P/b1hCC5/CJVHZdeulY8futc=", + "lastModified": 1775710090, + "narHash": "sha256-ar3rofg+awPB8QXDaFJhJ2jJhu+KqN/PRCXeyuXR76E=", "owner": "nixos", "repo": "nixpkgs", - "rev": "d96b37bbeb9840f1c0ebfe90585ef5067b69bbb3", + "rev": "4c1018dae018162ec878d42fec712642d214fdfa", "type": "github" }, "original": { "owner": "nixos", - "ref": "nixos-25.11", + "ref": "nixos-unstable", "repo": "nixpkgs", "type": "github" } @@ -52,10 +70,27 @@ "type": "github" } }, + "nixpkgs_2": { + "locked": { + "lastModified": 1775525138, + "narHash": "sha256-BQb70+B378ECLO8iQT3P/b1hCC5/CJVHZdeulY8futc=", + "owner": "nixos", + "repo": "nixpkgs", + "rev": "d96b37bbeb9840f1c0ebfe90585ef5067b69bbb3", + "type": "github" + }, + "original": { + "owner": "nixos", + "ref": "nixos-25.11", + "repo": "nixpkgs", + "type": "github" + } + }, "root": { "inputs": { "home-manager": "home-manager", - "nixpkgs": "nixpkgs", + "htt-src": "htt-src", + "nixpkgs": "nixpkgs_2", "nixpkgs-unstable": "nixpkgs-unstable" } } diff --git a/flake.nix b/flake.nix index 0180abc..5592d23 100644 --- a/flake.nix +++ b/flake.nix @@ -5,17 +5,21 @@ nixpkgs.url = "github:nixos/nixpkgs/nixos-25.11"; nixpkgs-unstable.url = "github:nixos/nixpkgs/nixos-unstable"; + htt-src.url = "git+ssh://gitea@typofelho.ddns.net/TypoMustakes/hyprland-toggle-tiling.git"; + home-manager = { url = "github:nix-community/home-manager"; inputs.nixpkgs.follows = "nixpkgs"; }; }; - outputs = { self, nixpkgs, nixpkgs-unstable, home-manager, ... }: { + outputs = { self, htt-src, nixpkgs, nixpkgs-unstable, home-manager, ... }: { nixosConfigurations.Prometheus = nixpkgs.lib.nixosSystem { system = "x86_64-linux"; specialArgs = { + htt = htt-src.packages.x86_64-linux.default; + pkgs-unstable = import nixpkgs-unstable { system = "x86_64-linux"; config.allowUnfree = true; @@ -32,6 +36,8 @@ system = "x86_64-linux"; specialArgs = { + htt = htt-src.packages.x86_64-linux.default; + pkgs-unstable = import nixpkgs-unstable { system = "x86_64-linux"; config.allowUnfree = true; diff --git a/home.nix b/home.nix index 91d7302..22f644c 100644 --- a/home.nix +++ b/home.nix @@ -1,4 +1,4 @@ -{ lib, config, pkgs, ... }: +{ lib, config, pkgs, htt, ... }: { imports = [ @@ -9,6 +9,7 @@ homeDirectory = "/home/typo"; stateVersion = "25.11"; packages = with pkgs; [ + htt killall lutris bottles diff --git a/hyprland/scripts/themeswitch.nix b/hyprland/scripts/themeswitch.nix index c8c681e..6459881 100644 --- a/hyprland/scripts/themeswitch.nix +++ b/hyprland/scripts/themeswitch.nix @@ -105,11 +105,11 @@ update() { case "$SELECTED" in $OPTION_DARK) dconf write /org/gnome/desktop/interface/color-scheme \'prefer-dark\' - swww img /home/typo/.config/backgrounds/gruvbox/wp11058332.png -t grow --transition-duration 1 --transition-fps 60 --transition-pos 0.$((1 + $RANDOM % 9)),0.$((1 + $RANDOM % 9)) + swww img /home/typo/.config/backgrounds/gruvbox/nix_dark.png -t grow --transition-duration 1 --transition-fps 60 --transition-pos 0.$((1 + $RANDOM % 9)),0.$((1 + $RANDOM % 9)) ;; $OPTION_LIGHT) dconf write /org/gnome/desktop/interface/color-scheme \'prefer-light\' - swww img /home/typo/.config/backgrounds/gruvbox/chinese-hills.jpg -t grow --transition-duration 1 --transition-fps 60 --transition-pos 0.$((1 + $RANDOM % 9)),0.$((1 + $RANDOM % 9)) + swww img /home/typo/.config/backgrounds/gruvbox/nix_light.png -t grow --transition-duration 1 --transition-fps 60 --transition-pos 0.$((1 + $RANDOM % 9)),0.$((1 + $RANDOM % 9)) ;; *) diff --git a/modules/common.nix b/modules/common.nix index 8b39d91..51875e0 100644 --- a/modules/common.nix +++ b/modules/common.nix @@ -1,4 +1,4 @@ -{ pkgs, pkgs-unstable, lib, ... }: +{ pkgs, pkgs-unstable, htt, lib, ... }: { nix.settings.experimental-features = [ "nix-command" "flakes" ]; @@ -66,6 +66,10 @@ home-manager = { useGlobalPkgs = true; useUserPackages = true; + extraSpecialArgs = { + inherit htt; + }; + users.typo = import ../home.nix; };