From a754632a59d17272a4a3e044950f18f23cde95b9 Mon Sep 17 00:00:00 2001 From: k Date: Thu, 23 Jan 2025 12:39:45 -0500 Subject: [PATCH 1/4] Added missing programs --- hosts/home/hyprland.nix | 35 ++++++++++++++++++++++++++++++----- hosts/home/tile.nix | 15 ++++++++++++++- 2 files changed, 44 insertions(+), 6 deletions(-) diff --git a/hosts/home/hyprland.nix b/hosts/home/hyprland.nix index abec126..4930691 100644 --- a/hosts/home/hyprland.nix +++ b/hosts/home/hyprland.nix @@ -6,16 +6,41 @@ }: { imports = [./waybar.nix ./tile.nix]; home.packages = with pkgs; [ - hyprlock - hyprpaper iio-hyprland - batsignal jq #iio-hyprland needs this ]; + programs = { + hyprlock.enable = true; + }; + services = { - hypridle.enable=true; - hyprpaper.enable=true; + hyprpaper.enable = true; + batsignal.enable = true; + hypridle = { + enable = true; + package = pkgs.hypridle; + + settings = { + general = { + after_sleep_cmd = "hyprctl dispatch dpms on"; + ignore_dbus_inhibit = false; + lock_cmd = "hyprlock"; + }; + + listener = [ + { + timeout = 900; + on-timeout = "hyprlock"; + } + { + timeout = 1200; + on-timeout = "hyprctl dispatch dpms off"; + on-resume = "hyprctl dispatch dpms on"; + } + ]; + }; + }; }; wayland.windowManager.hyprland = { diff --git a/hosts/home/tile.nix b/hosts/home/tile.nix index 038d735..e68e384 100644 --- a/hosts/home/tile.nix +++ b/hosts/home/tile.nix @@ -4,12 +4,25 @@ inputs, ... }: { - services = {mako = {enable = true;};}; + services = { + mako = { + enable = true; + defaultTimeout = 4000; + }; + }; programs = { alacritty = {enable = true;}; wofi = {enable = true;}; zathura = {enable = true;}; mpv = {enable = true;}; + lf = {enable = true;}; }; + home.packages = with pkgs; [ + brightnessctl + pulsemixer + unzip + zip + swayimg + ]; stylix.targets.wofi.enable = true; #this dosnt follow auto enable for some reson } From a94f2615ef8ce2e71e674e17cc8fed4072a18f46 Mon Sep 17 00:00:00 2001 From: k Date: Thu, 23 Jan 2025 12:40:03 -0500 Subject: [PATCH 2/4] fixed formating isue --- hosts/server/configuration.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/hosts/server/configuration.nix b/hosts/server/configuration.nix index 5b666ef..b660076 100644 --- a/hosts/server/configuration.nix +++ b/hosts/server/configuration.nix @@ -20,7 +20,7 @@ nixpkgs.config = { allowUnfree = true; - vaapiIntel = pkgs.vaapiIntel.override { enableHybridCodec = true; }; + vaapiIntel = pkgs.vaapiIntel.override {enableHybridCodec = true;}; }; programs = { From 5af08eb27fa00b89e65b2ead1bb3700d60e73b03 Mon Sep 17 00:00:00 2001 From: k Date: Sat, 25 Jan 2025 11:32:51 -0500 Subject: [PATCH 3/4] testing nushell on laptop --- hosts/home/home_common.nix | 50 ++++++++++++++++++++++------------ hosts/laptop/configuration.nix | 4 +-- 2 files changed, 35 insertions(+), 19 deletions(-) diff --git a/hosts/home/home_common.nix b/hosts/home/home_common.nix index e13b2e3..1ec3761 100644 --- a/hosts/home/home_common.nix +++ b/hosts/home/home_common.nix @@ -17,24 +17,40 @@ }; tmux.enable = true; starship.enable = true; - zsh = { + nushell = { enable = true; - autosuggestion.enable = true; - enableCompletion = true; - syntaxHighlighting.enable = true; - autocd = true; - plugins = [ - { - name = "zsh-nix-shell"; - file = "nix-shell.plugin.zsh"; - src = pkgs.fetchFromGitHub { - owner = "chisui"; - repo = "zsh-nix-shell"; - rev = "v0.8.0"; - sha256 = "1lzrn0n4fxfcgg65v0qhnj7wnybybqzs4adz7xsrkgmcsr0ii8b7"; - }; - } - ]; + shellAliases = { + cat = "bat"; + }; + extraConfig = '' + $env.config = { + show_banner: false, + } + ''; }; + carapace = { + enable = true; + enableNushellIntegration = true; + }; + bat.enable = true; + # zsh = { + # enable = true; + # autosuggestion.enable = true; + # enableCompletion = true; + # syntaxHighlighting.enable = true; + # autocd = true; + # plugins = [ + # { + # name = "zsh-nix-shell"; + # file = "nix-shell.plugin.zsh"; + # src = pkgs.fetchFromGitHub { + # owner = "chisui"; + # repo = "zsh-nix-shell"; + # rev = "v0.8.0"; + # sha256 = "1lzrn0n4fxfcgg65v0qhnj7wnybybqzs4adz7xsrkgmcsr0ii8b7"; + # }; + # } + # ]; + # }; }; } diff --git a/hosts/laptop/configuration.nix b/hosts/laptop/configuration.nix index 5102a91..f8a3135 100644 --- a/hosts/laptop/configuration.nix +++ b/hosts/laptop/configuration.nix @@ -152,8 +152,8 @@ isNormalUser = true; description = "k"; extraGroups = ["networkmanager" "wheel"]; - packages = with pkgs; [zsh]; - shell = pkgs.zsh; + packages = with pkgs; [nushell]; + shell = pkgs.nushell; }; home-manager = { From 08396bb47913ed6658815ac1d9dd43c72fb1fcfe Mon Sep 17 00:00:00 2001 From: k Date: Sun, 26 Jan 2025 17:03:21 +0000 Subject: [PATCH 4/4] updated flake.lock --- flake.lock | 107 ++++++++++++++++++++++++++++++++++------------------- 1 file changed, 68 insertions(+), 39 deletions(-) diff --git a/flake.lock b/flake.lock index 4fe5a78..03cfefd 100644 --- a/flake.lock +++ b/flake.lock @@ -37,11 +37,11 @@ "base16-helix": { "flake": false, "locked": { - "lastModified": 1725860795, - "narHash": "sha256-Z2o8VBPW3I+KKTSfe25kskz0EUj7MpUh8u355Z1nVsU=", + "lastModified": 1736852337, + "narHash": "sha256-esD42YdgLlEh7koBrSqcT7p2fsMctPAcGl/+2sYJa2o=", "owner": "tinted-theming", "repo": "base16-helix", - "rev": "7f795bf75d38e0eea9fed287264067ca187b88a9", + "rev": "03860521c40b0b9c04818f2218d9cc9efc21e7a5", "type": "github" }, "original": { @@ -53,11 +53,11 @@ "base16-vim": { "flake": false, "locked": { - "lastModified": 1731949548, - "narHash": "sha256-XIDexXM66sSh5j/x70e054BnUsviibUShW7XhbDGhYo=", + "lastModified": 1735953590, + "narHash": "sha256-YbQwaApLFJobn/0lbpMKcJ8N5axKlW2QIGkDS5+xoSU=", "owner": "tinted-theming", "repo": "base16-vim", - "rev": "61165b1632409bd55e530f3dbdd4477f011cadc6", + "rev": "c2a1232aa2c0ed27dcbf005779bcfe0e0ab5e85d", "type": "github" }, "original": { @@ -66,14 +66,30 @@ "type": "github" } }, + "firefox-gnome-theme": { + "flake": false, + "locked": { + "lastModified": 1736899990, + "narHash": "sha256-S79Hqn2EtSxU4kp99t8tRschSifWD4p/51++0xNWUxw=", + "owner": "rafaelmardojai", + "repo": "firefox-gnome-theme", + "rev": "91ca1f82d717b02ceb03a3f423cbe8082ebbb26d", + "type": "github" + }, + "original": { + "owner": "rafaelmardojai", + "repo": "firefox-gnome-theme", + "type": "github" + } + }, "flake-compat": { "flake": false, "locked": { - "lastModified": 1696426674, - "narHash": "sha256-kvjfFW7WAETZlt09AgDn1MrtKzP7t90Vf7vypd3OL1U=", + "lastModified": 1733328505, + "narHash": "sha256-NeCCThCEP3eCl2l/+27kNNK7QrwZB1IJCrXfrbv5oqU=", "owner": "edolstra", "repo": "flake-compat", - "rev": "0f9255e01c2351cc7d116c072cb317785dd33b33", + "rev": "ff81ac966bb2cae68946d5ed5fc4994f96d0ffec", "type": "github" }, "original": { @@ -129,19 +145,14 @@ "nixpkgs": [ "stylix", "nixpkgs" - ], - "nixpkgs-stable": [ - "stylix", - "git-hooks", - "nixpkgs" ] }, "locked": { - "lastModified": 1731363552, - "narHash": "sha256-vFta1uHnD29VUY4HJOO/D6p6rxyObnf+InnSMT4jlMU=", + "lastModified": 1735882644, + "narHash": "sha256-3FZAG+pGt3OElQjesCAWeMkQ7C/nB1oTHLRQ8ceP110=", "owner": "cachix", "repo": "git-hooks.nix", - "rev": "cd1af27aa85026ac759d5d3fccf650abe7e1bbf0", + "rev": "a5a961387e75ae44cc20f0a57ae463da5e959656", "type": "github" }, "original": { @@ -216,11 +227,11 @@ ] }, "locked": { - "lastModified": 1735774425, - "narHash": "sha256-C73gLFnEh8ZI0uDijUgCDWCd21T6I6tsaWgIBHcfAXg=", + "lastModified": 1736785676, + "narHash": "sha256-TY0jUwR3EW0fnS0X5wXMAVy6h4Z7Y6a3m+Yq++C9AyE=", "owner": "nix-community", "repo": "home-manager", - "rev": "5f6aa268e419d053c3d5025da740e390b12ac936", + "rev": "fc52a210b60f2f52c74eac41a8647c1573d2071d", "type": "github" }, "original": { @@ -231,11 +242,11 @@ }, "nixos-hardware": { "locked": { - "lastModified": 1735388221, - "narHash": "sha256-e5IOgjQf0SZcFCEV/gMGrsI0gCJyqOKShBQU0iiM3Kg=", + "lastModified": 1737751639, + "narHash": "sha256-ZEbOJ9iT72iwqXsiEMbEa8wWjyFvRA9Ugx8utmYbpz4=", "owner": "NixOS", "repo": "nixos-hardware", - "rev": "7c674c6734f61157e321db595dbfcd8523e04e19", + "rev": "dfad538f751a5aa5d4436d9781ab27a6128ec9d4", "type": "github" }, "original": { @@ -247,11 +258,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1736200483, - "narHash": "sha256-JO+lFN2HsCwSLMUWXHeOad6QUxOuwe9UOAF/iSl1J4I=", + "lastModified": 1731755305, + "narHash": "sha256-v5P3dk5JdiT+4x69ZaB18B8+Rcu3TIOrcdG4uEX7WZ8=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "3f0a8ac25fb674611b98089ca3a5dd6480175751", + "rev": "057f63b6dc1a2c67301286152eb5af20747a9cb4", "type": "github" }, "original": { @@ -263,11 +274,11 @@ }, "nixpkgs_2": { "locked": { - "lastModified": 1736200483, - "narHash": "sha256-JO+lFN2HsCwSLMUWXHeOad6QUxOuwe9UOAF/iSl1J4I=", + "lastModified": 1737672001, + "narHash": "sha256-YnHJJ19wqmibLQdUeq9xzE6CjrMA568KN/lFPuSVs4I=", "owner": "nixos", "repo": "nixpkgs", - "rev": "3f0a8ac25fb674611b98089ca3a5dd6480175751", + "rev": "035f8c0853c2977b24ffc4d0a42c74f00b182cd8", "type": "github" }, "original": { @@ -279,11 +290,11 @@ }, "nixpkgs_3": { "locked": { - "lastModified": 1735648875, - "narHash": "sha256-fQ4k/hyQiH9RRPznztsA9kbcDajvwV1sRm01el6Sr3c=", + "lastModified": 1736798957, + "narHash": "sha256-qwpCtZhSsSNQtK4xYGzMiyEDhkNzOCz/Vfu4oL2ETsQ=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "47e29c20abef74c45322eca25ca1550cdf5c3b50", + "rev": "9abb87b552b7f55ac8916b6fc9e5cb486656a2f3", "type": "github" }, "original": { @@ -307,6 +318,7 @@ "base16-fish": "base16-fish", "base16-helix": "base16-helix", "base16-vim": "base16-vim", + "firefox-gnome-theme": "firefox-gnome-theme", "flake-compat": "flake-compat", "flake-utils": "flake-utils", "git-hooks": "git-hooks", @@ -316,14 +328,15 @@ "systems": "systems", "tinted-foot": "tinted-foot", "tinted-kitty": "tinted-kitty", - "tinted-tmux": "tinted-tmux" + "tinted-tmux": "tinted-tmux", + "tinted-zed": "tinted-zed" }, "locked": { - "lastModified": 1736011580, - "narHash": "sha256-8gmk/i9ZA5C6LGRnqHb5sZ8UKaqT5GnS6XxeSPMSz+s=", + "lastModified": 1737861120, + "narHash": "sha256-V/GWU1BQwbxyZif9RBvwn10S1KX+86uPkkI41KQEcQQ=", "owner": "danth", "repo": "stylix", - "rev": "7dfcdb410118dcd02ba1d85a2179a6f1c877403f", + "rev": "d6951d0b2ffe74e4779a180e9b6a0e17627756e1", "type": "github" }, "original": { @@ -384,11 +397,11 @@ "tinted-tmux": { "flake": false, "locked": { - "lastModified": 1729501581, - "narHash": "sha256-1ohEFMC23elnl39kxWnjzH1l2DFWWx4DhFNNYDTYt54=", + "lastModified": 1735737224, + "narHash": "sha256-FO2hRBkZsjlIRqzNHCPc/52yxg11kHGA8MEtSun9RwE=", "owner": "tinted-theming", "repo": "tinted-tmux", - "rev": "f0e7f7974a6441033eb0a172a0342e96722b4f14", + "rev": "aead506a9930c717ebf81cc83a2126e9ca08fa64", "type": "github" }, "original": { @@ -396,6 +409,22 @@ "repo": "tinted-tmux", "type": "github" } + }, + "tinted-zed": { + "flake": false, + "locked": { + "lastModified": 1725758778, + "narHash": "sha256-8P1b6mJWyYcu36WRlSVbuj575QWIFZALZMTg5ID/sM4=", + "owner": "tinted-theming", + "repo": "base16-zed", + "rev": "122c9e5c0e6f27211361a04fae92df97940eccf9", + "type": "github" + }, + "original": { + "owner": "tinted-theming", + "repo": "base16-zed", + "type": "github" + } } }, "root": "root",