diff --git a/.gitignore b/.gitignore deleted file mode 100644 index b4a403a..0000000 --- a/.gitignore +++ /dev/null @@ -1 +0,0 @@ -ssh.nix diff --git a/flake.lock b/flake.lock index 62d9ebc..90c9f3c 100644 --- a/flake.lock +++ b/flake.lock @@ -28,11 +28,11 @@ ] }, "locked": { - "lastModified": 1780816331, - "narHash": "sha256-0BYqs8yKWkOz2Q7+SP18N5E5gmDKSo6LSxIVIa0wWes=", + "lastModified": 1779604987, + "narHash": "sha256-ZQ5z+fVhxYKtIFwtqGp5O0PD84BM1riASvqDaN5Xs+s=", "owner": "nix-community", "repo": "nix-index-database", - "rev": "1a2ea89c917781e88508d9fd2b507f2d2a0e173c", + "rev": "8fba98c80b48fa013820e0163c5096922fea4ddd", "type": "github" }, "original": { @@ -43,11 +43,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1780952837, - "narHash": "sha256-Fwd1+spDtQ0hDyBwme6ufG3n4mY0UrjjFdYHv+G/Hds=", + "lastModified": 1779467186, + "narHash": "sha256-nOesoDCiXcUftqbRBMz9tt4blI5PvljMWbm3kuCA+0s=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "e820eb4a444b46a19b2e03e8dfd2359439ff30fe", + "rev": "b77b3de8775677f84492abe84635f87b0e153f0f", "type": "github" }, "original": { diff --git a/hosts/fw/config/dwm/config.def.h b/hosts/fw/config/dwm/config.def.h index 1e3b72c..9705aa0 100644 --- a/hosts/fw/config/dwm/config.def.h +++ b/hosts/fw/config/dwm/config.def.h @@ -1,7 +1,5 @@ /* See LICENSE file for copyright and license details. */ -#include - /* appearance */ static const unsigned int borderpx = 1; /* border pixel of windows */ static const unsigned int snap = 32; /* snap pixel */ @@ -62,49 +60,42 @@ static const Layout layouts[] = { static char dmenumon[2] = "0"; /* component of dmenucmd, manipulated in spawn() */ static const char *dmenucmd[] = { "dmenu_run", "-m", dmenumon, "-fn", dmenufont, "-nb", col_gray1, "-nf", col_gray3, "-sb", col_cyan, "-sf", col_gray4, NULL }; static const char *termcmd[] = { "alacritty", NULL }; -static const char *brightness[2][4] = { { "brightnessctl", "set", "5%+", NULL }, { "brightnessctl", "set", "5%-", NULL } }; -static const char *volume[3][5] = { { "pactl", "set-sink-volume", "@DEFAULT_SINK@", "+5%", NULL}, { "pactl", "set-sink-volume", "@DEFAULT_SINK@", "-5%", NULL}, { "pactl", "set-sink-mute", "@DEFAULT_SINK@", "toggle", NULL} }; static const Key keys[] = { - /* modifier key function argument */ - { MODKEY, XK_p, spawn, {.v = dmenucmd } }, - { MODKEY, XK_Return, spawn, {.v = termcmd } }, - { MODKEY, XK_b, togglebar, {0} }, - { MODKEY, XK_j, focusstack, {.i = +1 } }, - { MODKEY, XK_k, focusstack, {.i = -1 } }, - { MODKEY, XK_i, incnmaster, {.i = +1 } }, - { MODKEY, XK_d, incnmaster, {.i = -1 } }, - { MODKEY, XK_h, setmfact, {.f = -0.05} }, - { MODKEY, XK_l, setmfact, {.f = +0.05} }, - { MODKEY|ShiftMask, XK_Return, zoom, {0} }, - { MODKEY, XK_Tab, view, {0} }, - { MODKEY|ShiftMask, XK_c, killclient, {0} }, - { MODKEY, XK_t, setlayout, {.v = &layouts[0]} }, - { MODKEY, XK_f, setlayout, {.v = &layouts[1]} }, - { MODKEY, XK_m, setlayout, {.v = &layouts[2]} }, - { MODKEY, XK_space, setlayout, {0} }, - { MODKEY|ShiftMask, XK_space, togglefloating, {0} }, - { MODKEY, XK_0, view, {.ui = ~0 } }, - { MODKEY|ShiftMask, XK_0, tag, {.ui = ~0 } }, - { MODKEY, XK_comma, focusmon, {.i = -1 } }, - { MODKEY, XK_period, focusmon, {.i = +1 } }, - { MODKEY|ShiftMask, XK_comma, tagmon, {.i = -1 } }, - { MODKEY|ShiftMask, XK_period, tagmon, {.i = +1 } }, - { 0, XF86XK_MonBrightnessUp, spawn, {.v = brightness[0] } }, - { 0, XF86XK_MonBrightnessDown, spawn, {.v = brightness[1] } }, - { 0, XF86XK_AudioRaiseVolume, spawn, {.v = volume[0] } }, - { 0, XF86XK_AudioLowerVolume, spawn, {.v = volume[1] } }, - { 0, XF86XK_AudioMute, spawn, {.v = volume[2] } }, - TAGKEYS( XK_1, 0) - TAGKEYS( XK_2, 1) - TAGKEYS( XK_3, 2) - TAGKEYS( XK_4, 3) - TAGKEYS( XK_5, 4) - TAGKEYS( XK_6, 5) - TAGKEYS( XK_7, 6) - TAGKEYS( XK_8, 7) - TAGKEYS( XK_9, 8) - { MODKEY|ShiftMask, XK_q, quit, {0} }, + /* modifier key function argument */ + { MODKEY, XK_p, spawn, {.v = dmenucmd } }, + { MODKEY, XK_Return, spawn, {.v = termcmd } }, + { MODKEY, XK_b, togglebar, {0} }, + { MODKEY, XK_j, focusstack, {.i = +1 } }, + { MODKEY, XK_k, focusstack, {.i = -1 } }, + { MODKEY, XK_i, incnmaster, {.i = +1 } }, + { MODKEY, XK_d, incnmaster, {.i = -1 } }, + { MODKEY, XK_h, setmfact, {.f = -0.05} }, + { MODKEY, XK_l, setmfact, {.f = +0.05} }, + { MODKEY|ShiftMask, XK_Return, zoom, {0} }, + { MODKEY, XK_Tab, view, {0} }, + { MODKEY|ShiftMask, XK_c, killclient, {0} }, + { MODKEY, XK_t, setlayout, {.v = &layouts[0]} }, + { MODKEY, XK_f, setlayout, {.v = &layouts[1]} }, + { MODKEY, XK_m, setlayout, {.v = &layouts[2]} }, + { MODKEY, XK_space, setlayout, {0} }, + { MODKEY|ShiftMask, XK_space, togglefloating, {0} }, + { MODKEY, XK_0, view, {.ui = ~0 } }, + { MODKEY|ShiftMask, XK_0, tag, {.ui = ~0 } }, + { MODKEY, XK_comma, focusmon, {.i = -1 } }, + { MODKEY, XK_period, focusmon, {.i = +1 } }, + { MODKEY|ShiftMask, XK_comma, tagmon, {.i = -1 } }, + { MODKEY|ShiftMask, XK_period, tagmon, {.i = +1 } }, + TAGKEYS( XK_1, 0) + TAGKEYS( XK_2, 1) + TAGKEYS( XK_3, 2) + TAGKEYS( XK_4, 3) + TAGKEYS( XK_5, 4) + TAGKEYS( XK_6, 5) + TAGKEYS( XK_7, 6) + TAGKEYS( XK_8, 7) + TAGKEYS( XK_9, 8) + { MODKEY|ShiftMask, XK_q, quit, {0} }, }; /* button definitions */ diff --git a/hosts/fw/configuration.nix b/hosts/fw/configuration.nix index fbc39e2..12b8f2d 100644 --- a/hosts/fw/configuration.nix +++ b/hosts/fw/configuration.nix @@ -17,36 +17,8 @@ hardware.bluetooth = { enable = true; - powerOnBoot = true; - settings = { - General = { - Name = "Hello"; - ControllerMode = "dual"; - FastConnectable = "true"; - Experimental = "true"; - }; - Policy = { - AutoEnable = "true"; - }; - }; + powerOnBoot = false; }; - services.blueman.enable = true; - hardware.enableAllFirmware = true; - - # boot.kernelPackages = pkgs.linuxPackages_latest; - - boot.kernelPackages = pkgs.linuxPackagesFor ( - pkgs.linux_latest.override { - argsOverride = rec { - version = "7.0.6"; - modDirVersion = "7.0.6"; - src = pkgs.fetchurl { - url = "mirror://kernel/linux/kernel/v7.x/linux-${version}.tar.xz"; - sha256 = "08vm18wx6399phzgr3wz94yga3ab4fyca79445ygvbspm904996b"; - }; - }; - } - ); # Bootloader. boot.loader.systemd-boot.enable = true; @@ -56,9 +28,6 @@ "/dev/disk/by-uuid/1dfcf980-6806-4f69-bd86-ee87c904c04b"; networking.hostName = "fw"; # Define your hostname. # networking.wireless.enable = true; # Enables wireless support via wpa_supplicant. - #networking.extraHosts = '' - # 65.109.157.161 wstn.de - #''; # Configure network proxy if necessary # networking.proxy.default = "http://user:password@proxy:port/"; @@ -95,18 +64,18 @@ variant = ""; }; - #services.xserver.windowManager.dwm = { - # enable = true; - # package = pkgs.dwm.overrideAttrs { - # src = ./config/dwm; - # }; - #}; + services.xserver.windowManager.dwm = { + enable = true; + package = pkgs.dwm.overrideAttrs { + src = ./config/dwm; + }; + }; # Enable the KDE Plasma Desktop Environment. - services.displayManager.sddm.enable = true; - services.desktopManager.plasma6.enable = true; + # services.displayManager.sddm.enable = true; + # services.desktopManager.plasma6.enable = true; - #services.displayManager.ly.enable = true; + services.displayManager.ly.enable = true; # Enable CUPS to print documents. services.printing.enable = true; @@ -137,9 +106,6 @@ extraGroups = [ "networkmanager" "wheel" - "libvirtd" - "docker" - "video" ]; packages = with pkgs; [ ]; }; @@ -158,51 +124,8 @@ keepassxc nextcloud-client dmenu - arandr - brave - pavucontrol - signal-desktop - simplex-chat-desktop - ayugram-desktop - dnsmasq - file - gnumake - rustdesk - nmap - usbutils - brightnessctl - pulseaudio - moreutils - spacer - yubioath-flutter - slack - mpv - netbird-ui - python3 ]; - virtualisation.libvirtd.enable = true; - virtualisation.docker = { - enable = true; - package = pkgs.docker_29; - }; - programs.virt-manager.enable = true; - programs.fuse.userAllowOther = true; - services.pcscd.enable = true; - - services.netbird.enable = true; - #services.netbird.clients.wt0 = { - # login = { - # enable = true; - # #setupKeyFile = /home/tsi/.config/netbird/setup-key; - # }; - - # port = 51821; - # ui.enable = true; - # #openFirewall = true; - # #oepnInternalFirewall = true; - #}; - # Some programs need SUID wrappers, can be configured further or are # started in user sessions. # programs.mtr.enable = true; @@ -220,7 +143,7 @@ # networking.firewall.allowedTCPPorts = [ ... ]; # networking.firewall.allowedUDPPorts = [ ... ]; # Or disable the firewall altogether. - networking.firewall.enable = false; + # networking.firewall.enable = false; # This value determines the NixOS release from which the default # settings for stateful data, like file locations and database versions diff --git a/modules/home-manager/bash.nix b/modules/home-manager/bash.nix index 0938d63..7289f06 100644 --- a/modules/home-manager/bash.nix +++ b/modules/home-manager/bash.nix @@ -3,9 +3,6 @@ { programs.bash = { enable = true; - initExtra = '' - xset r rate 200 60 - ''; shellAliases = { rb = "sudo nixos-rebuild switch --flake /etc/nixos#fw"; nx = "vim ~/nixos-config/hosts/fw/configuration.nix"; diff --git a/modules/home-manager/rustdesk.nix b/modules/home-manager/rustdesk.nix deleted file mode 100644 index 77848c8..0000000 --- a/modules/home-manager/rustdesk.nix +++ /dev/null @@ -1,9 +0,0 @@ -{ pkgs, ... }: - -{ - home.packages = with pkgs; [ - rustdesk - ]; - - home.file.".config/rustdesk/RustDesk2.toml".source = ./rustdesk/RustDesk2.toml; -} diff --git a/modules/home-manager/ssh.nix b/modules/home-manager/ssh.nix new file mode 100644 index 0000000..c115c9a --- /dev/null +++ b/modules/home-manager/ssh.nix @@ -0,0 +1,19 @@ +{ ... }: + +{ + services.ssh-agent.enable = true; + + home.sessionVariables = { + SSH_AUTH_SOCK = "$XDG_RUNTIME_DIR/ssh-agent"; + }; + + programs.ssh = { + enable = true; + enableDefaultConfig = false; + matchBlocks = { + "*" = { + identitiesOnly = true; + }; + }; + }; +}