From 1c18f14092d453df8b3802611bf405d0f2f51e56 Mon Sep 17 00:00:00 2001 From: fleaz Date: Tue, 16 Apr 2024 14:31:38 +0200 Subject: [PATCH 01/10] home/neovim: Configure NIL --- home-manager/modules/neovim.nix | 23 +++++++++++++++++++---- 1 file changed, 19 insertions(+), 4 deletions(-) diff --git a/home-manager/modules/neovim.nix b/home-manager/modules/neovim.nix index 5c314c7..e9414d0 100644 --- a/home-manager/modules/neovim.nix +++ b/home-manager/modules/neovim.nix @@ -4,10 +4,10 @@ enable = true; withPython3 = true; extraPackages = with pkgs; [ - nil - nixpkgs-fmt - gopls - pyright + nil + nixpkgs-fmt + gopls + pyright (python3.withPackages (ps: with ps; [ black flake8 @@ -141,6 +141,7 @@ let g:go_highlight_types = 1 let g:go_highlight_operators = 1 let g:go_highlight_build_constraints = 1 + " Don't use gopls from vim-go let g:go_gopls_enabled = 0 @@ -159,6 +160,20 @@ require('lspconfig').gopls.setup{} require('lspconfig').pyright.setup{} + require('lspconfig').nil_ls.setup { + autostart = true, + capabilities = caps, + cmd = { "nil" }, + settings = { + ['nil'] = { + testSetting = 42, + formatting = { + command = { "nixpkgs-fmt" }, + }, + }, + }, + } + vim.api.nvim_create_autocmd('LspAttach', { desc = 'LSP actions', callback = function() From 286af02f411f1f69a81ef175d6d17436af715f88 Mon Sep 17 00:00:00 2001 From: fleaz Date: Tue, 16 Apr 2024 22:31:01 +0200 Subject: [PATCH 02/10] home/kanshi: Switch left and right screen --- home-manager/modules/kanshi.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/home-manager/modules/kanshi.nix b/home-manager/modules/kanshi.nix index 89843e7..d8b864b 100644 --- a/home-manager/modules/kanshi.nix +++ b/home-manager/modules/kanshi.nix @@ -17,12 +17,12 @@ let status = "disable"; } { - criteria = "DP-9"; + criteria = "DP-10"; scale = 1.3; position = "0,0"; } { - criteria = "DP-10"; + criteria = "DP-9"; scale = 1.3; position = "2952,0"; } From f91ba323d62a1a80f6be4c1b5da2ede3f69199a1 Mon Sep 17 00:00:00 2001 From: fleaz Date: Wed, 17 Apr 2024 00:07:00 +0200 Subject: [PATCH 03/10] home-manager: fix laptop names and remove default kanshi installation --- home-manager/default.nix | 9 +-------- 1 file changed, 1 insertion(+), 8 deletions(-) diff --git a/home-manager/default.nix b/home-manager/default.nix index 390cdd2..8f20ff0 100644 --- a/home-manager/default.nix +++ b/home-manager/default.nix @@ -28,9 +28,7 @@ in modules/manual.nix modules/tig.nix ../secrets/ssh-config.nix - ] ++ lib.optionals (config.networking.hostName == "jimbo") [ - modules/kanshi.nix - ] ++ lib.optionals (config.networking.hostName == "milhouse") [ + ] ++ lib.optionals (config.networking.hostName == "smithers") [ modules/kanshi.nix ]; @@ -155,11 +153,6 @@ in defaultTimeout = 5000; }; - services.kanshi = { - enable = true; - - }; - services.gammastep = { enable = true; tray = true; From d638ae8bb696d1fdbc5ecfa0b5523f49d80567f6 Mon Sep 17 00:00:00 2001 From: fleaz Date: Mon, 29 Apr 2024 16:45:54 +0200 Subject: [PATCH 04/10] home/dell: Drop mattermost-desktop and stuff used by nvim-coc --- home-manager/dell.nix | 5 ----- 1 file changed, 5 deletions(-) diff --git a/home-manager/dell.nix b/home-manager/dell.nix index 09c9b71..5e06418 100644 --- a/home-manager/dell.nix +++ b/home-manager/dell.nix @@ -26,13 +26,8 @@ subversionClient tig freerdp - mattermost-desktop firefox - # for coc - nodejs - #rnix-lsp - # for zsh-fzf plugin fzf From 62b8e09a2002c1d92ef87ae6d9281f6a62c58043 Mon Sep 17 00:00:00 2001 From: fleaz Date: Tue, 30 Apr 2024 17:48:17 +0200 Subject: [PATCH 05/10] home/neovim: Add autosession plugin --- home-manager/modules/neovim.nix | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/home-manager/modules/neovim.nix b/home-manager/modules/neovim.nix index e9414d0..9fe3a7b 100644 --- a/home-manager/modules/neovim.nix +++ b/home-manager/modules/neovim.nix @@ -63,6 +63,9 @@ # show marks vim-signature + + # Session management + auto-session ]; extraConfig = '' @@ -155,6 +158,10 @@ let g:neoformat_enabled_python = ['black', 'isort'] lua << EOF + require("auto-session").setup { + auto_save_enabled = true; + auto_restore_enabled = true; + } require("bufferline").setup{} require('lspconfig').gopls.setup{} From a440429c6d5bc1f27dd73016afcd49e961c3498c Mon Sep 17 00:00:00 2001 From: fleaz Date: Tue, 30 Apr 2024 22:11:06 +0200 Subject: [PATCH 06/10] home/sway: Add screen config for smithers --- home-manager/modules/sway.nix | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/home-manager/modules/sway.nix b/home-manager/modules/sway.nix index ddb805f..e7a322d 100644 --- a/home-manager/modules/sway.nix +++ b/home-manager/modules/sway.nix @@ -33,6 +33,12 @@ in scale = "1.3"; position = "2953,0"; }; + } // lib.optionalAttrs (nixosConfig.networking.hostName == "smithers") { + "eDP-1" = { + mode = "2256x1504"; + scale = "1.3"; + position = "0,0"; + }; }; gaps = { inner = 8; }; From 9e5ad4f30445ebd63265d998e9706ef2ccfa2150 Mon Sep 17 00:00:00 2001 From: fleaz Date: Tue, 7 May 2024 19:09:01 +0200 Subject: [PATCH 07/10] Install fwupd --- modules/fwupd.nix | 3 +++ roles/all.nix | 11 ++++++++--- 2 files changed, 11 insertions(+), 3 deletions(-) create mode 100644 modules/fwupd.nix diff --git a/modules/fwupd.nix b/modules/fwupd.nix new file mode 100644 index 0000000..a62f709 --- /dev/null +++ b/modules/fwupd.nix @@ -0,0 +1,3 @@ +{ + services.fwupd.enable = true; +} diff --git a/roles/all.nix b/roles/all.nix index 9d9a2ce..2c4f8db 100644 --- a/roles/all.nix +++ b/roles/all.nix @@ -1,6 +1,6 @@ -{pkgs, config, ...}: +{ pkgs, config, ... }: let - consoleFont = hiDPI : if hiDPI then "Lat2-Terminus16" else "Lat2-Terminus20"; + consoleFont = hiDPI: if hiDPI then "Lat2-Terminus16" else "Lat2-Terminus20"; in { imports = [ @@ -23,6 +23,7 @@ in ../modules/gc.nix ../modules/sway.nix ../modules/nixld.nix + ../modules/fwupd.nix ../secrets/remote-builder.nix ../users/fleaz.nix @@ -59,7 +60,11 @@ in # Look mum, I'm using all the new shiny stuff! nix.settings.experimental-features = [ "nix-command" "flakes" ]; + # TMP + networking.firewall = { + allowedTCPPorts = [ 3000 ]; + }; + networking.extraHosts = '' ''; } - From 9960cd491a30402dd1723b583755c3ce93266158 Mon Sep 17 00:00:00 2001 From: fleaz Date: Tue, 7 May 2024 19:09:51 +0200 Subject: [PATCH 08/10] Add some RICE --- home-manager/modules/sway.nix | 56 +++++++++++++++++-- home-manager/modules/waybar.css | 97 +++++++++------------------------ home-manager/modules/waybar.nix | 5 +- modules/sway.nix | 1 + 4 files changed, 82 insertions(+), 77 deletions(-) diff --git a/home-manager/modules/sway.nix b/home-manager/modules/sway.nix index e7a322d..bc7b24b 100644 --- a/home-manager/modules/sway.nix +++ b/home-manager/modules/sway.nix @@ -5,6 +5,7 @@ in { wayland.windowManager.sway = { enable = true; + package = pkgs.swayfx; wrapperFeatures.gtk = true; config = { @@ -41,19 +42,59 @@ in }; }; - gaps = { inner = 8; }; - window.border = 0; + gaps = { inner = 10; }; + window.border = 2; + window.hideEdgeBorders = "smart"; workspaceAutoBackAndForth = true; terminal = "foot"; + colors = { + focused = { + border = "#4c7899"; + background = "#285577"; + text = "#ffffff"; + indicator = "#2e9ef4"; + childBorder = "#285577"; + }; + focusedInactive = { + border = "#333333"; + background = "#5f676a"; + text = "#ffffff"; + indicator = "#484e50"; + childBorder = "#5f676a"; + }; + unfocused = { + border = "#333333"; + background = "#222222"; + text = "#888888"; + indicator = "#292d2e"; + childBorder = "#900000"; + }; + urgent = { + border = "#2f343a"; + background = "#900000"; + text = "#ffffff"; + indicator = "#900000"; + childBorder = "#900000"; + }; + placeholder = { + border = "#000000"; + background = "#0c0c0c"; + text = "#ffffff"; + indicator = "#000000"; + childBorder = "#0c0c0c"; + }; + }; + + bars = [{ command = "${pkgs.waybar}/bin/waybar"; }]; startup = [ { command = ''${pkgs.swayidle}/bin/swayidle -w \ timeout 600 "${lockCmd}" \ - timeout 900 "${pkgs.sway}/bin/swaymsg output * dpms off" \ - resume "${pkgs.sway}/bin/swaymsg output * dpms on" \ + timeout 900 "${pkgs.swayfx}/bin/swaymsg output * dpms off" \ + resume "${pkgs.swayfx}/bin/swaymsg output * dpms on" \ before-sleep "${lockCmd}"''; } ]; @@ -145,6 +186,13 @@ in }; }; + extraConfig = '' + blur enable + blur_radius 10 + + default_dim_inactive 0.2 + corner_radius 15 + ''; }; } diff --git a/home-manager/modules/waybar.css b/home-manager/modules/waybar.css index 69584f8..2109610 100644 --- a/home-manager/modules/waybar.css +++ b/home-manager/modules/waybar.css @@ -1,11 +1,3 @@ -/* ============================================================================= - * - * Waybar configuration - * - * Configuration reference: https://github.com/Alexays/Waybar/wiki/Configuration - * - * =========================================================================== */ - /* ----------------------------------------------------------------------------- * Keyframes * -------------------------------------------------------------------------- */ @@ -55,22 +47,34 @@ @define-color teal #8ec07c; @define-color gray #928374; -/* Reset all styles */ * { - border: none; - border-radius: 0; - min-height: 0; - margin: 0; - padding: 0; + border: none; + font-family: Inconsolata, Inconsolata Nerd Font, FiraCode Nerd Font Mono; + font-weight: bold; + font-size: 14pt; + color: @light; + border-radius: 20px; + background: transparent; } -/* The whole bar */ -#waybar { - background: @dark; - color: @light; - font-family: Inconsolata, Inconsolata Nerd Font, FiraCode Nerd Font Mono; - font-size: 14pt; - font-weight: bold; +/*-----module groups----*/ +.modules-right { + padding: 3px; + background-color: @dark; + margin: 5px; + border-radius: 10px; +} +.modules-center { + padding: 3px; + background-color: @dark; + margin: 5px; + border-radius: 10px; +} +.modules-left { + padding: 3px; + margin: 5px; + background-color: @dark; + border-radius: 10px; } /* All modules */ @@ -132,7 +136,6 @@ animation-duration: 3s; } -/* And now modules themselves in their respective order */ /* Workspaces stuff */ #workspaces button { @@ -144,60 +147,14 @@ } #workspaces button.focused { - border-bottom: 2px solid @orange; + border: 1px solid @orange; } #workspaces button.visible:not(.focused) { - border-bottom: 2px solid @gray; + border: 1px solid @gray; } #workspaces button.urgent { color: @orange; } -#mode { /* Shows current Sway mode (resize etc.) */ - padding-left: 10px; - color: @light; - background: @red; -} - -#window { - margin-right: 30px; - margin-left: 30px; -} - -#pulseaudio { - border-bottom: 2px solid @red; -} - -#network { - border-bottom: 2px solid @orange; -} - -#memory { - border-bottom: 2px solid @yellow; -} - -#cpu { - border-bottom: 2px solid @green; -} - -#temperature { - border-bottom: 2px solid @teal; -} - -#battery { - border-bottom: 2px solid @blue; -} - -#tray { -} - -#clock { - border-bottom: 2px solid @light; -} - -#pulseaudio.muted { - /* No styles */ -} - diff --git a/home-manager/modules/waybar.nix b/home-manager/modules/waybar.nix index 750c457..579b822 100644 --- a/home-manager/modules/waybar.nix +++ b/home-manager/modules/waybar.nix @@ -7,9 +7,9 @@ height = 28; modules-left = [ "sway/workspaces" - "sway/window" ]; modules-center = [ + "clock" ]; modules-right = [ "disk" @@ -20,7 +20,6 @@ "temperature" "battery" "tray" - "clock" ]; modules = { "battery" = { @@ -28,7 +27,7 @@ warning = 20; critical = 10; }; - format = " {capacity}%"; + format = " {capacity}%"; format-discharging = "{icon} {capacity}%"; format-icons = [ "" diff --git a/modules/sway.nix b/modules/sway.nix index 9afd805..d5a8dec 100644 --- a/modules/sway.nix +++ b/modules/sway.nix @@ -1,6 +1,7 @@ { # enable sway, so we have a swaylock pam config programs.sway.enable = true; + programs.sway.package = null; # autologin services.greetd = { From 066d4a41f3ae57c2a77760a1fa9e31f8cb8965d2 Mon Sep 17 00:00:00 2001 From: fleaz Date: Fri, 24 May 2024 00:00:15 +0200 Subject: [PATCH 09/10] home: Drop some packages --- home-manager/default.nix | 9 +-------- 1 file changed, 1 insertion(+), 8 deletions(-) diff --git a/home-manager/default.nix b/home-manager/default.nix index 8f20ff0..24dd73b 100644 --- a/home-manager/default.nix +++ b/home-manager/default.nix @@ -90,7 +90,6 @@ in fzf ncmpcpp acpi - joplin # cli joplin-desktop # gui unstable.prusa-slicer @@ -105,19 +104,13 @@ in gnome.gedit pwgen - # for coc - nodejs - #rnix-lsp + nixpkgs-fmt # kubernetes stuff kubectl krew kubectx - # from my overlay - studio-link - python3.pkgs.brother-ql - ] ++ lib.optionals (config.my.isLaptop) [ networkmanager ]; From e5143b7af05b95221b7b21f82f4be9b290b5be3a Mon Sep 17 00:00:00 2001 From: fleaz Date: Fri, 24 May 2024 00:00:47 +0200 Subject: [PATCH 10/10] home/waybar: small css changes --- home-manager/modules/waybar.css | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/home-manager/modules/waybar.css b/home-manager/modules/waybar.css index 2109610..a153050 100644 --- a/home-manager/modules/waybar.css +++ b/home-manager/modules/waybar.css @@ -61,18 +61,18 @@ .modules-right { padding: 3px; background-color: @dark; - margin: 5px; + margin: 0 5px 5px 0; border-radius: 10px; } .modules-center { padding: 3px; background-color: @dark; - margin: 5px; + margin: 0 0 5px 0; border-radius: 10px; } .modules-left { padding: 3px; - margin: 5px; + margin: 0 0 5px 5px; background-color: @dark; border-radius: 10px; } @@ -86,7 +86,8 @@ #network, #pulseaudio, #temperature, -#tray { +#tray, +#disk { background: transparent; color: @light; padding-left: 10px;