diff options
| -rw-r--r-- | machines/devhell/eir.nix | 1 | ||||
| -rw-r--r-- | machines/devhell/gunnr.nix | 25 | ||||
| -rw-r--r-- | machines/devhell/herja.nix | 1 | ||||
| -rw-r--r-- | machines/devhell/hildr.nix | 1 | ||||
| -rw-r--r-- | machines/sternenseemann/wolfgang.nix | 3 | ||||
| -rw-r--r-- | modules/user/devhell/profiles/base.nix | 6 | ||||
| -rw-r--r-- | modules/user/devhell/profiles/packages.nix | 1 | ||||
| -rw-r--r-- | modules/user/sternenseemann/services/sway.nix | 50 |
8 files changed, 44 insertions, 44 deletions
diff --git a/machines/devhell/eir.nix b/machines/devhell/eir.nix index 36115245..6e695010 100644 --- a/machines/devhell/eir.nix +++ b/machines/devhell/eir.nix @@ -182,7 +182,6 @@ programs = { light.enable = true; - wavemon.enable = true; }; environment.systemPackages = with pkgs; [ diff --git a/machines/devhell/gunnr.nix b/machines/devhell/gunnr.nix index b252157c..70774e1c 100644 --- a/machines/devhell/gunnr.nix +++ b/machines/devhell/gunnr.nix @@ -31,23 +31,8 @@ kernelParams = [ "pcie_aspm=off" ]; kernelModules = [ "kvm-amd" ]; - extraModulePackages = [ - ( - config.boot.kernelPackages.rtl88xxau-aircrack.overrideAttrs - { - # https://github.com/aircrack-ng/rtl8812au/pull/1134 - src = pkgs.fetchFromGitHub { - owner = "crivasr"; - repo = "rtl8812au"; - rev = "c0d16813f5af3b464cdb6dd415c83d1f238e3548"; - hash = "sha256-jhX5apYbcYz6+kGGe1xZXXTerQJm3Gv4DoowDSSY8MY="; - }; - } - ) - ]; - blacklistedKernelModules = [ ]; - kernelPackages = lib.mkForce - config.boot.zfs.package.latestCompatibleLinuxPackages; + extraModulePackages = [ ]; + blacklistedKernelModules = [ "btusb" ]; }; hardware = { @@ -124,9 +109,9 @@ services.zfs.autoScrub.enable = true; - services.timesyncd = { - servers = [ "ntp.canterbury.ac.uk" ]; - }; +# services.timesyncd = { +# servers = [ "ntp.canterbury.ac.uk" ]; +# }; #### Machine-specific packages configuration #### diff --git a/machines/devhell/herja.nix b/machines/devhell/herja.nix index ef65dea4..d0c2ad54 100644 --- a/machines/devhell/herja.nix +++ b/machines/devhell/herja.nix @@ -129,7 +129,6 @@ programs = { light.enable = false; - wavemon.enable = true; }; environment.systemPackages = with pkgs; [ diff --git a/machines/devhell/hildr.nix b/machines/devhell/hildr.nix index 52bc5590..2149e802 100644 --- a/machines/devhell/hildr.nix +++ b/machines/devhell/hildr.nix @@ -176,7 +176,6 @@ programs = { light.enable = true; - wavemon.enable = true; }; environment.systemPackages = with pkgs; [ diff --git a/machines/sternenseemann/wolfgang.nix b/machines/sternenseemann/wolfgang.nix index aabf1a95..66779e4c 100644 --- a/machines/sternenseemann/wolfgang.nix +++ b/machines/sternenseemann/wolfgang.nix @@ -83,6 +83,7 @@ in { browser.pkg gpxsee msr-tools + quasselClient # hunspell # (with hunspellDicts; [ de-de en-gb-large en-us ]) ]; @@ -91,8 +92,6 @@ in { BROWSER = browser.bin; }; - services.lorri.enable = true; - services.xserver = { videoDrivers = [ "intel" ]; }; diff --git a/modules/user/devhell/profiles/base.nix b/modules/user/devhell/profiles/base.nix index 3ce8828e..fa24afa5 100644 --- a/modules/user/devhell/profiles/base.nix +++ b/modules/user/devhell/profiles/base.nix @@ -90,6 +90,12 @@ in { bash = { enableCompletion = true; }; + singularity = { + enable = true; + package = pkgs.apptainer; + enableSuid = true; + enableFakeroot = true; + }; starship = { enable = true; settings = { diff --git a/modules/user/devhell/profiles/packages.nix b/modules/user/devhell/profiles/packages.nix index ebf227d2..12d7ed82 100644 --- a/modules/user/devhell/profiles/packages.nix +++ b/modules/user/devhell/profiles/packages.nix @@ -229,6 +229,7 @@ in { ripgrep rq rsync + rustcat rustdesk rustic-rs rwpspread diff --git a/modules/user/sternenseemann/services/sway.nix b/modules/user/sternenseemann/services/sway.nix index 6eab6726..673e9a03 100644 --- a/modules/user/sternenseemann/services/sway.nix +++ b/modules/user/sternenseemann/services/sway.nix @@ -92,10 +92,19 @@ in { }; colors = { - background = mkColorOption "background" "#000000"; - active = mkColorOption "active window" "#ffffff"; - inactive = mkColorOption "inactive window" "#000000"; + background = mkColorOption "background" "#ffffea"; + statusBackground = mkColorOption "background of status bar" "#ffffea"; + statusText = mkColorOption "status bar text color" "#000000"; + + active = mkColorOption "active window" "#9EEEEE"; + activeText = mkColorOption "active window text" "#000000"; + + inactive = mkColorOption "inactive window" "#eaffff"; + inactiveText = mkColorOption "inactive window text" "#000000"; + urgent = mkColorOption "urgent window" "#900000"; + urgentText = mkColorOption "urgent window text" "#ffffff"; + indicate = mkColorOption "indicator" "#d0d0d0"; }; @@ -279,19 +288,22 @@ in { font "${cfg.font.name} ${builtins.toString cfg.font.size}" # colors - set $bg ${cfg.colors.background} - set $act ${cfg.colors.active} - set $inact ${cfg.colors.inactive} - set $urg ${cfg.colors.urgent} - set $ind ${cfg.colors.indicate} + set $bg ${cfg.colors.background} + set $act ${cfg.colors.active} + set $act_text ${cfg.colors.activeText} + set $inact ${cfg.colors.inactive} + set $inact_text ${cfg.colors.inactiveText} + set $urg ${cfg.colors.urgent} + set $urg_text ${cfg.colors.urgentText} + set $ind ${cfg.colors.indicate} output * bg $bg solid_color - # class border backgr. text indicator - client.focused $act $act $inact $ind - client.focused_inactive $inact $inact $act $inact - client.unfocused $inact $inact $act $inact - client.urgent $urg $urg $act $urg + # class border backgr. text indicator + client.focused $act $act $act_text $ind + client.focused_inactive $inact $inact $inact_text $ind + client.unfocused $inact $inact $inact_text $ind + client.urgent $urg $urg $urg_text $ind # bar aesthetics bar { @@ -300,13 +312,13 @@ in { position top colors { font "${cfg.font.name} ${builtins.toString cfg.font.size}" - statusline $act - background $inact + statusline ${cfg.colors.statusText} + background ${cfg.colors.statusBackground} # type border bg text - focused_workspace $act $act $inact - active_workspace $act $act $ind - inactive_workspace $inact $inact $act - urgent_workspace $urg $urg $act + focused_workspace $act $act $act_text + active_workspace $act $act $act_text + inactive_workspace $inact $inact $inact_text + urgent_workspace $urg $urg $urg_text } } |