diff --git a/config/home/packages.nix b/config/home/packages.nix index 6a8bace..59eb655 100644 --- a/config/home/packages.nix +++ b/config/home/packages.nix @@ -13,11 +13,11 @@ spotify brightnessctl swayidle vim wget curl neovide neovim (nerdfonts.override { fonts = [ "JetBrainsMono" ]; }) # Import Scripts - (import ./config/scripts/emopicker9000.nix { inherit pkgs; }) - (import ./config/scripts/task-waybar.nix { inherit pkgs; }) - (import ./config/scripts/squirtle.nix { inherit pkgs; }) - (import ./config/scripts/wallsetter.nix { inherit pkgs; inherit wallpaperDir; }) - (import ./config/scripts/themechange.nix { inherit pkgs; inherit flakeDir; }) - (import ./config/scripts/theme-selector.nix { inherit pkgs; }) + (import ./../scripts/emopicker9000.nix { inherit pkgs; }) + (import ./../scripts/task-waybar.nix { inherit pkgs; }) + (import ./../scripts/squirtle.nix { inherit pkgs; }) + (import ./../scripts/wallsetter.nix { inherit pkgs; inherit wallpaperDir; }) + (import ./../scripts/themechange.nix { inherit pkgs; inherit flakeDir; }) + (import ./../scripts/theme-selector.nix { inherit pkgs; }) ]; } diff --git a/config/scripts/themechange.nix b/config/scripts/themechange.nix index b97f831..4a7bd10 100644 --- a/config/scripts/themechange.nix +++ b/config/scripts/themechange.nix @@ -6,6 +6,6 @@ pkgs.writeShellScriptBin "themechange" '' else replacement="$1" sed -i "/^\s*theme[[:space:]]*=[[:space:]]*\"/s/\"\(.*\)\"/\"$replacement\"/" ${flakeDir}/flake.nix - kitty -e sudo nixos-rebuild switch --flake ${flakeDir}#workstation && swaync-client -R && swaync-client -rs + kitty -e sudo nixos-rebuild switch --flake ${flakeDir} && swaync-client -R && swaync-client -rs fi '' diff --git a/flake.lock b/flake.lock index 84f0a1e..7c40d53 100644 --- a/flake.lock +++ b/flake.lock @@ -23,11 +23,11 @@ ] }, "locked": { - "lastModified": 1704980875, - "narHash": "sha256-IPZmMjk5f4TBbEpzUFBc3OC1W6OwDNEXk2w/0uVXX1o=", + "lastModified": 1705476964, + "narHash": "sha256-W5OK1fnj4qdn1HWOlxV2S3YiUvfaVjQM5ldWVpGV1fs=", "owner": "nix-community", "repo": "home-manager", - "rev": "5f0ab0eedc6ede69beb8f45561ffefa54edc6e65", + "rev": "85c3b600f660abd86e94cbcd1c46733943197a07", "type": "github" }, "original": { @@ -46,11 +46,11 @@ "xdph": "xdph" }, "locked": { - "lastModified": 1705070596, - "narHash": "sha256-Xq3JOddIH7AnACEHGaSKg71IF8CATE1zSTzdgR4pnlo=", + "lastModified": 1705503680, + "narHash": "sha256-e+ou1KvZeZp104yeCgvgTTp5G+DB380CUZuUkijZxAc=", "owner": "hyprwm", "repo": "Hyprland", - "rev": "c4da4b026deefd58f532353b64e9f17130e760ca", + "rev": "c4365f20ed8ff0dd480b7ed7cf1bfff1a0b6911a", "type": "github" }, "original": { @@ -86,7 +86,11 @@ }, "hyprlang": { "inputs": { - "nixpkgs": "nixpkgs_2" + "nixpkgs": [ + "hyprland", + "xdph", + "nixpkgs" + ] }, "locked": { "lastModified": 1704287638, @@ -123,11 +127,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1704194953, - "narHash": "sha256-RtDKd8Mynhe5CFnVT8s0/0yqtWFMM9LmCzXv/YKxnq4=", + "lastModified": 1705133751, + "narHash": "sha256-rCIsyE80jgiOU78gCWN3A0wE0tR2GI5nH6MlS+HaaSQ=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "bd645e8668ec6612439a9ee7e71f7eac4099d4f6", + "rev": "9b19f5e77dd906cb52dade0b7bd280339d2a1f3d", "type": "github" }, "original": { @@ -154,27 +158,11 @@ }, "nixpkgs_2": { "locked": { - "lastModified": 1702645756, - "narHash": "sha256-qKI6OR3TYJYQB3Q8mAZ+DG4o/BR9ptcv9UnRV2hzljc=", + "lastModified": 1705331948, + "narHash": "sha256-qjQXfvrAT1/RKDFAMdl8Hw3m4tLVvMCc8fMqzJv0pP4=", "owner": "nixos", "repo": "nixpkgs", - "rev": "40c3c94c241286dd2243ea34d3aef8a488f9e4d0", - "type": "github" - }, - "original": { - "owner": "NixOS", - "ref": "nixos-unstable", - "repo": "nixpkgs", - "type": "github" - } - }, - "nixpkgs_3": { - "locked": { - "lastModified": 1704874635, - "narHash": "sha256-YWuCrtsty5vVZvu+7BchAxmcYzTMfolSPP5io8+WYCg=", - "owner": "nixos", - "repo": "nixpkgs", - "rev": "3dc440faeee9e889fe2d1b4d25ad0f430d449356", + "rev": "b8dd8be3c790215716e7c12b247f45ca525867e2", "type": "github" }, "original": { @@ -189,7 +177,7 @@ "home-manager": "home-manager", "hyprland": "hyprland", "nix-colors": "nix-colors", - "nixpkgs": "nixpkgs_3" + "nixpkgs": "nixpkgs_2" } }, "systems": { @@ -243,11 +231,11 @@ ] }, "locked": { - "lastModified": 1704400467, - "narHash": "sha256-IsEAKBCorRlN53FwFAMbyGLRsPVu/ZrWEJtCwykPds8=", + "lastModified": 1704659450, + "narHash": "sha256-3lyoUVtUWz1LuxbltAtkJSK2IlVXmKhxCRU2/0PYCms=", "owner": "hyprwm", "repo": "xdg-desktop-portal-hyprland", - "rev": "1c802128f6cc3db29a8ef01552b1a22f894eeefd", + "rev": "6a5de92769d5b7038134044053f90e7458f6a197", "type": "github" }, "original": { diff --git a/flake.nix b/flake.nix index b10aaf7..7700acd 100644 --- a/flake.nix +++ b/flake.nix @@ -20,7 +20,7 @@ gitEmail = "tylerzanekelley@gmail.com"; theLocale = "en_US.UTF-8"; theTimezone = "America/Chicago"; - theme = "tokyo-night-storm"; + theme = "onedark"; browser = "firefox"; wallpaperGit = "https://gitlab.com/Zaney/my-wallpapers.git"; wallpaperDir = "/home/${username}/Pictures/Wallpapers";