From f25dbe159fd29b22c0c2ee053fcff8cccc1bc900 Mon Sep 17 00:00:00 2001 From: autumn Date: Tue, 26 Aug 2025 13:34:14 -0600 Subject: [PATCH] starting zellij conf --- flake.lock | 12 +-- home-manager/packages/river/river.nix | 9 ++- home-manager/packages/waybar/waybar.nix | 9 ++- home-manager/packages/zellij/zellij.nix | 19 +++++ home-manager/ruby/home.nix | 98 ++++++++++++------------- system/yukigekko/configuration.nix | 4 +- 6 files changed, 88 insertions(+), 63 deletions(-) create mode 100644 home-manager/packages/zellij/zellij.nix diff --git a/flake.lock b/flake.lock index c59ad31..d43ad0e 100644 --- a/flake.lock +++ b/flake.lock @@ -7,11 +7,11 @@ ] }, "locked": { - "lastModified": 1755625756, - "narHash": "sha256-t57ayMEdV9g1aCfHzoQjHj1Fh3LDeyblceADm2hsLHM=", + "lastModified": 1756022458, + "narHash": "sha256-J1i35r4HfNDdPpwL0vOBaZopQudAUVtartEerc1Jryc=", "owner": "nix-community", "repo": "home-manager", - "rev": "dd026d86420781e84d0732f2fa28e1c051117b59", + "rev": "9e3a33c0bcbc25619e540b9dfea372282f8a9740", "type": "github" }, "original": { @@ -22,11 +22,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1755615617, - "narHash": "sha256-HMwfAJBdrr8wXAkbGhtcby1zGFvs+StOp19xNsbqdOg=", + "lastModified": 1756125398, + "narHash": "sha256-XexyKZpf46cMiO5Vbj+dWSAXOnr285GHsMch8FBoHbc=", "owner": "nixos", "repo": "nixpkgs", - "rev": "20075955deac2583bb12f07151c2df830ef346b4", + "rev": "3b9f00d7a7bf68acd4c4abb9d43695afb04e03a5", "type": "github" }, "original": { diff --git a/home-manager/packages/river/river.nix b/home-manager/packages/river/river.nix index 875d950..aa1d749 100644 --- a/home-manager/packages/river/river.nix +++ b/home-manager/packages/river/river.nix @@ -24,6 +24,9 @@ # spawn binds "Super Return" = "spawn alacritty"; "Super R" = "spawn fuzzel"; + "Super E" = "spawn fm"; + "Super O" = "spawn obsidian"; + # globals "Alt Q" = "close"; @@ -36,10 +39,10 @@ "Super K" = "focus-view previous"; "Super H" = "send-layout-cmd wideriver \"--count +1\""; "Super L" = "send-layout-cmd wideriver \"--count -1\""; - "Super+Shift H" = "send-layout-cmd wideriver \"--ratio +0.05\""; + "Super+Shift H" = "send-layout-cmd wideriver \"--ratio -0.05\""; "Super+Shift J" = "swap next"; "Super+Shift K" = "swap previous"; - "Super+Shift L" = "send-layout-cmd wideriver \"--ratio -0.05\""; + "Super+Shift L" = "send-layout-cmd wideriver \"--ratio +0.05\""; # "Super+Alt H" = "move left 100"; # "Super+Alt J" = "move down 100"; # "Super+Alt K" = "move up 100"; @@ -84,6 +87,4 @@ }; }; }; - } - diff --git a/home-manager/packages/waybar/waybar.nix b/home-manager/packages/waybar/waybar.nix index bcf5e28..0ebdcf2 100644 --- a/home-manager/packages/waybar/waybar.nix +++ b/home-manager/packages/waybar/waybar.nix @@ -22,7 +22,7 @@ "river/tags" ]; modules-center = [ - "river/mode" + #"river/mode" # "river/layout" "river/window" ]; @@ -79,6 +79,11 @@ ]; hide-vacant = true; }; + + "river/window" = { + format = "{}"; + max-length = 20; + }; "tray" = { icon-size = 21; @@ -152,8 +157,8 @@ portable = ""; car = ""; default = ["" "" ""]; - }; on-click = "pavucontrol"; + }; }; }; }; diff --git a/home-manager/packages/zellij/zellij.nix b/home-manager/packages/zellij/zellij.nix new file mode 100644 index 0000000..eeaf0d2 --- /dev/null +++ b/home-manager/packages/zellij/zellij.nix @@ -0,0 +1,19 @@ +{ config, pkgs, ... }: + +{ + + home.packages = with pkgs; [ + zellij + ]; + + programs.zellij = { + enable = true; + enableFishIntegration = true; + exitShellOnExit = true; + settings = { + theme = "everforest-dark"; + }; + }; + +} + diff --git a/home-manager/ruby/home.nix b/home-manager/ruby/home.nix index 1dfbcd0..5288b0a 100644 --- a/home-manager/ruby/home.nix +++ b/home-manager/ruby/home.nix @@ -1,55 +1,54 @@ { config, pkgs, ... }: { - # Home Manager needs a bit of information about you and the paths it should - # manage. - home.username = "ruby"; - home.homeDirectory = "/home/ruby"; - home.stateVersion = "25.05"; # Please read the comment before changing. - - - programs.home-manager.enable = true; - - - nixpkgs.config = { - alowUnfree = true; - allowUnfreePredicate = (_: true); - }; - - home.packages = with pkgs; [ - neofetch - vscodium-fhs - nerd-fonts.hack - vesktop - obsidian - ccls - docker-language-server - nil - ty - rustc - rustup - htop - gnumake - python314Full - eza - gleam - ruff - ruby - vscode-extensions.castwide.solargraph - nim-2_0 - nimlangserver - ]; - programs.htop.enable = true; - programs.starship.enable = true; - + home = { + username = "ruby"; + homeDirectory = "/home/ruby"; + stateVersion = "25.11"; + packages = with pkgs; [ + neofetch + vscodium-fhs + nerd-fonts.hack + vesktop + obsidian + ccls + docker-language-server + nil + ty + rustc + rustup + htop + gnumake + python314Full + eza + gleam + ruff + ruby + vscode-extensions.castwide.solargraph + rubyPackages_3_4.solargraph + nim-2_0 + nimlangserver + fm + zellij + kdlfmt + ]; + sessionVariables = { + EDITOR = "helix"; + TERM = "alacritty"; + }; + file = { + + }; + }; + programs = { + home-manager.enable = true; + htop.enable = true; + }; + nixpkgs.config = { + alowUnfree = true; + allowUnfreePredicate = (_: true); + }; wayland.windowManager.river.enable = true; - - - home.sessionVariables = { - EDITOR = "helix"; - TERM = "alacritty"; - }; - imports = [ ../packages/fish/fish.nix ../packages/river/river.nix @@ -59,6 +58,5 @@ ../packages/waybar/waybar.nix ../packages/git/git.nix ../packages/starship/starship.nix - ]; - + ]; } diff --git a/system/yukigekko/configuration.nix b/system/yukigekko/configuration.nix index 509649f..9e1e755 100644 --- a/system/yukigekko/configuration.nix +++ b/system/yukigekko/configuration.nix @@ -79,7 +79,7 @@ programs.firefox.enable = true; programs.bash.interactiveShellInit = "fish"; programs.appimage.enable = true; - programs.openvpn3.enable = true; + # programs.openvpn3.enable = true; # Enable OpenGL hardware.graphics = { @@ -114,9 +114,11 @@ vim # Do not forget to add an editor to edit configuration.nix! The Nano editor is also installed by default. # wget pavucontrol + darktile ]; nix.settings.experimental-features = ["nix-command" "flakes"]; + nix.settings.download-buffer-size = 5242880000; # Some programs need SUID wrappers, can be configured further or are # started in user sessions.