From 660285c74364345486facb6d4f55934245af9721 Mon Sep 17 00:00:00 2001 From: iiogama Date: Wed, 24 Jan 2024 21:38:01 -0800 Subject: [PATCH] [nb] Commit --- flake.lock | 6 +-- home-manager/dots/bash.nix | 8 +++- home-manager/dots/river.nix | 2 +- hosts/buckwheat/configuration.nix | 5 ++- hosts/buckwheat/home.nix | 18 --------- hosts/buckwheat/xorg.nix | 22 +++++++++++ hosts/default.nix | 8 ++-- hosts/fireweed/configuration.nix | 13 ++----- nixos/base.nix | 2 +- nixos/gui.nix | 1 + nixos/wayland.nix | 61 +++++++++++-------------------- 11 files changed, 68 insertions(+), 78 deletions(-) create mode 100644 hosts/buckwheat/xorg.nix diff --git a/flake.lock b/flake.lock index 72e2204..ac10ce7 100644 --- a/flake.lock +++ b/flake.lock @@ -22,11 +22,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1703013332, - "narHash": "sha256-+tFNwMvlXLbJZXiMHqYq77z/RfmpfpiI3yjL6o/Zo9M=", + "lastModified": 1705677747, + "narHash": "sha256-eyM3okYtMgYDgmYukoUzrmuoY4xl4FUujnsv/P6I/zI=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "54aac082a4d9bb5bbc5c4e899603abfb76a3f6d6", + "rev": "bbe7d8f876fbbe7c959c90ba2ae2852220573261", "type": "github" }, "original": { diff --git a/home-manager/dots/bash.nix b/home-manager/dots/bash.nix index 7550b1a..22432c1 100644 --- a/home-manager/dots/bash.nix +++ b/home-manager/dots/bash.nix @@ -1,4 +1,4 @@ -{ pkgs, config, ... }: +{ pkgs, config, user, ... }: { home.file = { ".bash_login" = { @@ -31,6 +31,12 @@ alias mkfoo='. $HOME/.local/bin/mkfoo.sh' alias ed='ed -p "> "' # Functions + function get-ssh() { + if [ ! -f $HOME/.ssh/id_ed25519.pub ]; then + ssh-keygen -t ed25519 -C "${user.email}" + fi + cat $HOME/.ssh/id_ed25519.pub + } function home() { cd clear diff --git a/home-manager/dots/river.nix b/home-manager/dots/river.nix index ad374b5..4543a41 100644 --- a/home-manager/dots/river.nix +++ b/home-manager/dots/river.nix @@ -157,7 +157,7 @@ # Global Configuration Settings riverctl default-layout rivertile rivertile -view-padding 10 -outer-padding 10 & - riverctl attach-mode top + riverctl attach-mode bottom riverctl hide-cursor timeout 10000 riverctl hide-cursor when-typing enabled riverctl set-cursor-warp on-focus-change diff --git a/hosts/buckwheat/configuration.nix b/hosts/buckwheat/configuration.nix index d909bd0..224aab6 100644 --- a/hosts/buckwheat/configuration.nix +++ b/hosts/buckwheat/configuration.nix @@ -72,7 +72,10 @@ in }; }; }; - programs.virt-manager.enable = true; + programs = { + virt-manager.enable = true; + river.enable = true; + }; users.users.${user.name} = { extraGroups = [ "davfs2" "libvirtd" "transmission" ]; packages = with pkgs; [ diff --git a/hosts/buckwheat/home.nix b/hosts/buckwheat/home.nix index bb2fb2f..a4ef5c9 100644 --- a/hosts/buckwheat/home.nix +++ b/hosts/buckwheat/home.nix @@ -1,24 +1,6 @@ # Buckwheat home.nix { config, lib, pkgs, inputs, user, ... }: { - xsession.windowManager.bspwm = { - monitors = { - DP-1 = [ - "1" - "2" - "3" - "4" - "5" - ]; - DP-2 = [ - "6" - "7" - "8" - "9" - "0" - ]; - }; - }; services = { udiskie = { enable = true; diff --git a/hosts/buckwheat/xorg.nix b/hosts/buckwheat/xorg.nix new file mode 100644 index 0000000..69ad390 --- /dev/null +++ b/hosts/buckwheat/xorg.nix @@ -0,0 +1,22 @@ +# Buckwheat home.nix +{ config, lib, pkgs, inputs, user, ... }: +{ + xsession.windowManager.bspwm = { + monitors = { + DP-1 = [ + "1" + "2" + "3" + "4" + "5" + ]; + DP-2 = [ + "6" + "7" + "8" + "9" + "0" + ]; + }; + }; +} diff --git a/hosts/default.nix b/hosts/default.nix index d245d82..4b930cf 100644 --- a/hosts/default.nix +++ b/hosts/default.nix @@ -27,9 +27,9 @@ inherit system; specialArgs = { inherit user inputs; }; modules = [ - ../nixos/xorg.nix - ../nixos/office.nix - ../nixos/pentest.nix + ../nixos/wayland.nix + ../nixos/collections/office.nix + ../nixos/collections/pentest.nix ./fireweed/configuration.nix home-manager.nixosModules.home-manager { home-manager.useGlobalPkgs = true; @@ -37,7 +37,7 @@ home-manager.extraSpecialArgs = { inherit user; }; home-manager.users.${user.name} = { imports = [ - ../home-manager/xorg.nix + ../home-manager/wayland.nix ./fireweed/home.nix ]; }; diff --git a/hosts/fireweed/configuration.nix b/hosts/fireweed/configuration.nix index d2b91ff..93e49ad 100644 --- a/hosts/fireweed/configuration.nix +++ b/hosts/fireweed/configuration.nix @@ -32,11 +32,6 @@ in allowedTCPPorts = [ 445 139 ]; allowedUDPPorts = [ 137 138 ]; }; - # Proxy configuration - # proxy = { - # default = "http://user:password@proxy:port/"; - # noProxy = "127.0.0.1,localhost,internal.domain"; - # }; }; users.users.${user.name} = { extraGroups = [ "davfs2" ]; @@ -51,11 +46,11 @@ in enable = true; package = pkgs.mullvad-vpn; }; - udisks2 = { + cage = { enable = true; - mountOnMedia = true; + program = "${pkgs.foot}/bin/foot"; + user = "${user.name}"; }; - # Enable automatic login for the user. - # getty.autologinUser = "${user.name}"; }; + getty.autologinUser = "${user.name}"; } diff --git a/nixos/base.nix b/nixos/base.nix index b573945..0c423d5 100644 --- a/nixos/base.nix +++ b/nixos/base.nix @@ -69,8 +69,8 @@ extraGroups = [ "networkmanager" "wheel" ]; initialPassword = "hunter2"; packages = with pkgs; [ + bottom eva - gotop links2 nix-du nmap diff --git a/nixos/gui.nix b/nixos/gui.nix index 27430e8..48cdf7a 100644 --- a/nixos/gui.nix +++ b/nixos/gui.nix @@ -45,6 +45,7 @@ users.users.${user.name}.packages = with pkgs; [ ani-cli glib + gparted lagrange librewolf mangal diff --git a/nixos/wayland.nix b/nixos/wayland.nix index 66518fe..2a55f40 100644 --- a/nixos/wayland.nix +++ b/nixos/wayland.nix @@ -22,46 +22,27 @@ ]; }; }; - services = { - cage = { - enable = true; - program = "${pkgs.foot}/bin/foot" - user = "${user.name}"; - }; - }; - programs = { - river = { - enable = true; - extraPackages = with pkgs; [ - bemenu - bemoji - cliphist - grim - foot - imv - kanshi - mako - pinentry-bemenu - slurp - swappy - swaylock - swww - tessen - waybar - wf-recorder - wl-clipboard - wtype - ]; - }; - wayfire = { - enable = true; - plugins = with pkgs.wayfirePlugins; [ - wcm - wf-shell - wayfire-plugins-extra - ]; - }; - xwayland = { + environment.systemPackages = with pkgs; [ + bemenu + bemoji + cliphist + grim + foot + imv + kanshi + mako + pinentry-bemenu + slurp + swappy + swaylock + swww + tessen + waybar + wf-recorder + wl-clipboard + wtype + ]; + programs.xwayland = { enable = true; }; };