From 6ff838b83f95d774c7b083751ecd224bbe76a6ad Mon Sep 17 00:00:00 2001 From: fwastring Date: Mon, 8 Sep 2025 21:45:19 +0200 Subject: [PATCH] Moved --- maskiner/jobb/configuration.nix | 29 ++-- moduler/base.nix | 1 + moduler/hyprland.nix | 7 +- moduler/k3s.nix | 2 +- moduler/sound.nix | 3 +- moduler/ssh.nix | 6 + moduler/system.nix | 2 +- moduler/waybar.nix | 256 -------------------------------- 8 files changed, 31 insertions(+), 275 deletions(-) diff --git a/maskiner/jobb/configuration.nix b/maskiner/jobb/configuration.nix index 7c32243..56ea2e1 100644 --- a/maskiner/jobb/configuration.nix +++ b/maskiner/jobb/configuration.nix @@ -4,7 +4,6 @@ { inputs, - lib, config, pkgs, myhostname, @@ -15,7 +14,6 @@ let in { imports = [ - # Include the results of the hardware scan. ./hardware-configuration.nix ../../moduler/base.nix @@ -38,7 +36,6 @@ in ]; }; - # Bootloader. boot.kernelPackages = pkgs.linuxPackages_latest; boot.extraModulePackages = [ (btusb.overrideAttrs (_: { @@ -47,25 +44,27 @@ in ]; hardware.enableRedistributableFirmware = true; - networking.hostName = myhostname; # Define your hostname. + networking.hostName = myhostname; + environment.systemPackages = with pkgs; [ + gonic + ]; services = { - #tailscale.enable = true; - picom.enable = true; - openssh = { + tailscale = { enable = true; + package = pkgs.unstable.tailscale; }; - blueman = { + searx = { enable = true; + redisCreateLocally = true; + settings.server = { + bind_address = "::1"; + port = 8000; + secret_key = "alsjdioefj.asdi"; + }; }; - printing.enable = true; }; - # Configure console keymap - console.keyMap = "sv-latin1"; - - services.xserver.dpi = 140; - - system.stateVersion = "25.05"; # Did you read the comment? + system.stateVersion = "25.05"; } diff --git a/moduler/base.nix b/moduler/base.nix index 90ad371..7cbf0d8 100644 --- a/moduler/base.nix +++ b/moduler/base.nix @@ -89,6 +89,7 @@ console.keyMap = "sv-latin1"; services = { + printing.enable = true; clipmenu.enable = true; openssh = { enable = true; diff --git a/moduler/hyprland.nix b/moduler/hyprland.nix index c52e31c..194bd8d 100644 --- a/moduler/hyprland.nix +++ b/moduler/hyprland.nix @@ -18,6 +18,7 @@ in hyprpolkitagent hyprland-qtutils waypipe + wmenu ]; @@ -109,7 +110,8 @@ in "$mod" = "ALT"; monitor = [ - "DP-1, 1920x1080@144, 0x0, 1" + "desc: ASUSTek COMPUTER INC ASUS PA279CV S4LMTF159462 (DP-1), 3840x2160@60, 0x0, 1.5" + "desc: ASUSTek COMPUTER INC VG279 JBLMQS021792 (DP-1), 1920x1080@144, 0x0, 1" ",prefered,auto,1" ]; @@ -208,6 +210,8 @@ in misc = { disable_hyprland_logo = true; disable_splash_rendering = true; + enable_swallow = true; + swallow_regex = "^(kitty)$"; }; bind = [ @@ -215,6 +219,7 @@ in "$mod, return, exec, $terminal" "$mod SHIFT, q, killactive" "$mod SHIFT, e, exit" + "$mod SHIFT, d, exec, /home/fw/scripts/dmenu_sys" "$mod SHIFT, x, exec, ${pkgs.hyprlock}/bin/hyprlock" # Screen focus diff --git a/moduler/k3s.nix b/moduler/k3s.nix index a12ec40..cb97284 100644 --- a/moduler/k3s.nix +++ b/moduler/k3s.nix @@ -26,7 +26,7 @@ in extraFlags = toString ([ "--write-kubeconfig-mode \"0644\"" "--cluster-init" - # "--disable servicelb" + "--disable servicelb" "--disable traefik" "--disable local-storage" ]); diff --git a/moduler/sound.nix b/moduler/sound.nix index 2979e21..11c4978 100644 --- a/moduler/sound.nix +++ b/moduler/sound.nix @@ -8,8 +8,9 @@ alsa.enable = true; alsa.support32Bit = true; pulse.enable = true; + systemWide = true; }; - blueman.enable = true; + blueman.enable = true; }; hardware = { bluetooth = { diff --git a/moduler/ssh.nix b/moduler/ssh.nix index c128a13..bb04c0e 100644 --- a/moduler/ssh.nix +++ b/moduler/ssh.nix @@ -68,6 +68,12 @@ user = "fw"; identityFile = "/home/fw/.ssh/fw-ssh-key"; }; + "desktop" = { + hostname = "192.168.1.227"; + port = 22; + user = "fw"; + identityFile = "/home/fw/.ssh/id_rsa"; + }; }; }; } diff --git a/moduler/system.nix b/moduler/system.nix index de85150..ff854ea 100644 --- a/moduler/system.nix +++ b/moduler/system.nix @@ -104,7 +104,7 @@ let base = pkgs.appimageTools.defaultFhsEnvArgs; in - pkgs.buildFHSUserEnv ( + pkgs.buildFHSEnv ( base // { name = "fhs"; diff --git a/moduler/waybar.nix b/moduler/waybar.nix index 32cdfd3..944b569 100644 --- a/moduler/waybar.nix +++ b/moduler/waybar.nix @@ -2,7 +2,6 @@ ... }: { - programs.waybar = { enable = true; systemd.enable = true; @@ -146,10 +145,6 @@ "app_ids-mapping" = { firefoxdeveloperedition = "firefox-developer-edition"; }; - rewrite = { - "Firefox Web Browser" = "Firefox"; - "Foot Server" = "Terminal"; - }; }; bluetooth = { "on-click" = "./scripts/bluetooth-control"; @@ -167,256 +162,5 @@ }; }; }; - style = '' - @define-color bg #eff1f5; - @define-color fg #4c4f69; - @define-color lbg #e6e9ef; - @define-color yellow #df8e1d; - @define-color lavender #7287fd; - @define-color peach #fe640b; - @define-color red #d20f39; - @define-color green #40a02b; - @define-color blue #1e66f5; - @define-color border #dce0e8; - - * { - min-height: 0; - margin: 0px 0px 0px 0px; - padding: 0; - border-radius: 7px; - font-family: "ComicShannsMono Nerd Font"; - font-size: 11pt; - font-weight: 700; - padding-bottom: 0px; - } - - tooltip { - background: @bg; - border-radius: 7px; - border: 2px solid @border; - } - - #window { - margin: 0px 0px 0px 0px; - padding-left: 10px; - padding-right: 7px; - border-radius: 3px; - border-color: @lbg; - background-color: @yellow; - color: @bg; - } - - window#waybar.empty #window { - background-color: @bg; - border-bottom: none; - border-right: none; - } - - window#waybar { - background-color: @bg; - color: @lavender; - } - - /* Workspaces */ - @keyframes button_activate { - from { opacity: .3 } - to { opacity: 1.; } - } - - #workspaces { - margin: 0px 0px 0px 0px; - border-radius: 3px; - padding: 1px; - background-color: @bg; - color: @bg; - } - - #workspaces button { - margin: 0px 0px 0px 0px; - border-radius: 3px; - padding-left: 3px; - padding-right: 9px; - background-color: @bg; - color: @fg; - } - - #workspaces button.active { - background-color:@blue; - color: @bg; - } - - #workspaces button.urgent { - color: #F38BA8; - } - - #workspaces button:hover { - border: solid transparent; - } - - #custom-gpu-util { - margin: 0px 0px 0px 0px; - padding-left: 10px; - padding-right: 10px; - border-radius: 7px; - background-color: @bg; - color: @fg; - } - - #tray { - margin: 0px 0px 0px 0px; - border-radius: 3px; - padding-left: 10px; - padding-right: 10px; - background-color: @bg; - color: @fg; - } - - #idle_inhibitor { - margin: 0px 0px 0px 0px; - padding-left: 10px; - padding-right: 12px; - border-radius: 3px; - background-color: @bg; - color: @fg; - } - - #network { - margin: 5px 5px 2px 5px; - padding-left: 10px; - padding-right: 12px; - border-radius: 7px; - background-color: @bg; - color: @lavender; - } - - #network.linked { - color: @peach; - } - #network.disconnected, - #network.disabled { - color: @red; - } - - #custom-subs { - color: @fg; - margin: 5px 5px 2px 5px; - padding-left: 10px; - padding-right: 12px; - border-radius: 3px; - border-bottom: 2px solid @bg; - border-right: 2px solid @bg; - border-color: @lbg; - background-color: @red; - } - - #custom-spacer { - background-color: @yellow; - } - - #custom-cliphist { - color: @peach; - margin: 5px 5px 2px 5px; - padding-left: 10px; - padding-right: 12px; - border-radius: 3px; - background-color: @bg; - } - - #custom-gpu-temp, - #cpu, - #memory, - #custom-clipboard, - #temperature { - margin: 0px 0px 0px 0px; - padding-left: 10px; - padding-right: 10px; - border-radius: 3px; - color: @fg; - background-color: @bg; - } - - #custom-playerctl { - margin: 5px 5px 2px 5px; - padding-left: 10px; - padding-right: 10px; - border-radius: 3px; - color: @fg; - background-color: @bg; - } - - #battery, - #backlight, - #bluetooth, - #pulseaudio { - margin-top: 5px; - margin-bottom: 2px; - color: @fg; - background-color: @bg; - border-top-right-radius: 0px; - border-bottom-right-radius: 0px; - border-top-left-radius: 3px; - border-bottom-left-radius: 3px; - } - - #battery, - #bluetooth { - margin-left: 0px; - margin-right: 5px; - padding-left: 7.5px; - padding-right: 10px; - border-top-left-radius: 0px; - border-bottom-left-radius: 0px; - border-top-right-radius: 3px; - border-bottom-right-radius: 3px; - } - - #backlight, - #pulseaudio { - margin-right: 0px; - margin-left: 5px; - padding-left: 10px; - padding-right: 7.5px; - border-top-right-radius: 0px; - border-bottom-right-radius: 0px; - border-top-left-radius: 3px; - border-bottom-left-radius: 3px; - } - - #clock { - margin: 0px 0px 0px 0px; - padding-left: 10px; - padding-right: 10px; - border-radius: 3px; - color: @bg; - background-color: @green; - } - - #taskbar { - border-radius: 0px 0px 0px 0; - padding: 0 3px; - margin: 0 0px; - color: #ffffff; - background-color: rgba(120,118,117,0.3); - } - #taskbar button { - border-radius: 0px 0px 0px 0px; - padding: 0 0 0 3px; - margin: 3px 1; - color: #ffffff; - background-color: rgba(120,118,117,0.1); - } - #taskbar button.active { - background-color: rgba(120,118,117,0.8); - } - - #mode { - margin: 0px 0px 0px 0px; - padding-left: 10px; - padding-right: 10px; - border-radius: 3px; - background-color: @bg; - color: @peach; - } - ''; }; }