From d59923fbb7e57859855109c087fc1a5c51a4d0d5 Mon Sep 17 00:00:00 2001 From: deadvey Date: Tue, 27 Aug 2024 15:15:40 +0100 Subject: [PATCH] 540 current 2024-08-27 15:11:05 24.05.3999.c42fcfbdfeae 6.6.46 * --- configuration.nix | 97 ++++++++++++++++++++++++++++++----------------- edit-config.sh | 2 +- nixos-switch.log | 92 +++----------------------------------------- 3 files changed, 69 insertions(+), 122 deletions(-) diff --git a/configuration.nix b/configuration.nix index 9551574..03d298c 100644 --- a/configuration.nix +++ b/configuration.nix @@ -7,16 +7,18 @@ let BORDER_WIDTH = "2"; BORDER_WIDTH_INT = 2; - CORNER_RADIUS = "10"; - CORNER_RADIUS_INT = 10; + CORNER_RADIUS = "0"; + CORNER_RADIUS_INT = 0; # Curves of 2px and 10px radius fits into a curve of 12px radius do border_width+ corner_radius - RECEIVING_CORNER_RADIUS = "15"; + RECEIVING_CORNER_RADIUS = "0"; - GAPS_IN = "10"; - GAPS_OUT = "20"; - HALF_OF_GAPS_OUT = "10"; + GAPS_IN = "3"; + GAPS_OUT = "6"; + HALF_OF_GAPS_OUT = "3"; + + BAR_WIDTH_INT = 15; - WALLPAPER = "$HOME/media/Pictures/wallpapers/forest.jpg"; + WALLPAPER = "$HOME/Pictures/wallpapers/forest.jpg"; # Colours BG = "282828"; @@ -91,6 +93,7 @@ in LC_TELEPHONE = "en_GB.UTF-8"; LC_TIME = "en_GB.UTF-8"; }; + services.xserver = { enable = true; desktopManager = { @@ -105,12 +108,20 @@ in xkb.layout = "gb"; xkb.variant = ""; }; + + programs.ydotool.enable = true; # Configure console keymap console.keyMap = "uk"; # Enable CUPS to print documents. services.printing.enable = true; + services.avahi = { + enable = true; + nssmdns4 = true; + openFirewall = true; + }; + # Enable sound with pipewire. sound.enable = true; @@ -141,24 +152,25 @@ in users.users.deadvey = { isNormalUser = true; description = "Dave Smith"; - extraGroups = [ "networkmanager" "wheel" ]; + extraGroups = [ "networkmanager" "wheel" "ydotool" ]; }; home-manager.users.deadvey = { pkgs, ... }: { home.packages = with pkgs; [ thunderbird gramps - librewolf - xonotic + graphviz + qutebrowser libreoffice gimp - ladybird + freetube + ace-of-penguins + okular + xonotic keepassxc tor-browser gruvbox-plus-icons gruvbox-gtk-theme - #emacsPackages.ement # Element client for emacs cinny-desktop - crosswords ]; wayland.windowManager.hyprland.enable = true; @@ -199,16 +211,6 @@ in }; }; - programs.ncmpcpp = { - enable = true; - }; - - services.mpd = { - enable = true; - musicDirectory = "~/media/Audio/playlist"; - extraConfig = "bind_to_address '127.0.0.1'\n#test"; - }; - xdg.mimeApps = { enable = true; defaultApplications = { @@ -246,16 +248,30 @@ in enable = true; shellAliases= { emacs="emacs -nw"; - nixrc="exec $HOME/media/Code/git/nixos/edit-config.sh"; + nixrc="exec $HOME/Code/git/nixos/edit-config.sh"; ls="eza -l"; l="lsd"; }; bashrcExtra = ''fastfetch - XDG_SCREENSHOTS_DIR="$HOME/media/Pictures/other/Screenshots" + XDG_SCREENSHOTS_DIR="$HOME/Pictures/other/Screenshots" export XDG_SCREENSHOTS_DIR PS1="\n\e[0;35m\$?\n\e[1;31m[\e[0;32m\u\e[0;36m@\e[0;31m\h \e[1;36m\w\e[1;31m]\e[0m\n > "''; }; + + programs.qutebrowser.settings = { + enable = true; + settings = { + colors = { + hints = { + bg = "#${BG}"; + fg = "#${FG}"; + }; + tabs.bar.bg = "#${BG}"; + }; + }; + }; + programs.kitty = { enable = true; settings = { @@ -573,7 +589,7 @@ valign = bottom # Put a picture of choice here. Default is the current wallpaper image { - path = $HOME/media/Pictures/other/steampunk.jpg + path = $HOME/Pictures/other/steampunk.jpg size = 230 rounding = -1 border_size = 2 @@ -612,12 +628,12 @@ valign = bottom "$mod SHIFT, right, movewindow, r" "$mod SHIFT, up, movewindow, u" "$mod SHIFT, down, movewindow, d" - "$mod, P, exec, grimshot savecopy area" + ",Print, exec, grimshot savecopy area" "$mod CONTROL, left, resizeactive, -20 0" "$mod CONTROL, right, resizeactive, 20 0" "$mod CONTROL, up, resizeactive, 0 -20" "$mod CONTROL, down, resizeactive, 0 20" - "$mod, L, exec, hyprlock" + ",XF86WakeUp, exec, hyprlock" "$mod, code:67, exec, cmus-remote -Q | grep 'file' | sed 's/file //' | mpv --playlist=- --no-audio --pause" "$mod, code:68, exec, pactl set-sink-volume @DEFAULT_SINK@ -5%" "$mod, code:69, exec, pactl set-sink-volume @DEFAULT_SINK@ +5%" @@ -626,6 +642,17 @@ valign = bottom "$mod, code:72, exec, cmus-remote --prev" "$mod, code:73, exec, cmus-remote --play" "$mod, code:74, exec, cmus-remote --next" + + # Mouse control with Numpad + ",KP_Down, exec, ydotool mousemove -x 0 -y 10" + ",KP_End, exec, ydotool mousemove -x -10 -y 0" + ",KP_Next, exec, ydotool mousemove -x 10 -y 0" + ",KP_Begin, exec, ydotool mousemove -x 0 -y -10" + ",KP_Left, exec, ydotool click 00" + ",KP_Right, exec, ydotool click 01" + ",KP_Up, exec, ydotool click 02" + ",KP_Home, exec, ydotool click 80" + ",KP_Prior, exec, ydotool click 40" ] ++ ( # workspaces @@ -661,6 +688,7 @@ valign = bottom wayland.windowManager.hyprland.extraConfig = '' exec-once=hyprpaper exec-once=waybar + exec-once=gammastep -O 3000k ''; programs.waybar = { @@ -689,7 +717,7 @@ valign = bottom position = "top"; mode = "overlay"; exclusive = "true"; - height = 30; + height = BAR_WIDTH_INT; width = 1000; margin-top = 0; margin-bottom = 0; @@ -749,7 +777,7 @@ valign = bottom layer = "top"; position = "bottom"; mode = "overlay"; - height = 30; + height = BAR_WIDTH_INT; width = 1000; margin-top = 0; margin-bottom = 0; @@ -973,15 +1001,16 @@ valign = bottom mpv killall zip - ncmpcpp - mpd + ntfs3g + ydotool + gammastep # Filters out blue light + libnotify pulseaudio - nerdfonts eza - spotdl ]; fonts.packages = with pkgs; [ + nerdfonts noto-fonts noto-fonts-cjk noto-fonts-emoji diff --git a/edit-config.sh b/edit-config.sh index 137a857..52c0175 100755 --- a/edit-config.sh +++ b/edit-config.sh @@ -2,7 +2,7 @@ sudo emacs /etc/nixos/configuration.nix -nw sudo nixos-rebuild switch &>nixos-switch.log || ( cat nixos-switch.log | grep --color error && false) gen=$(nixos-rebuild list-generations | grep current) -sudo cp /etc/nixos/configuration.nix $HOME/media/Code/git/nixos +sudo cp /etc/nixos/configuration.nix . git add . git commit -m "$gen" if grep -q "error" nixos-switch.log; then diff --git a/nixos-switch.log b/nixos-switch.log index 51030fe..db774bf 100644 --- a/nixos-switch.log +++ b/nixos-switch.log @@ -1,89 +1,7 @@ -error: - … while evaluating the attribute 'config' - - at /nix/var/nix/profiles/per-user/root/channels/nixos/lib/modules.nix:322:9: - - 321| options = checked options; - 322| config = checked (removeAttrs config [ "_module" ]); - | ^ - 323| _module = checked (config._module); - - … while calling the 'seq' builtin - - at /nix/var/nix/profiles/per-user/root/channels/nixos/lib/modules.nix:322:18: - - 321| options = checked options; - 322| config = checked (removeAttrs config [ "_module" ]); - | ^ - 323| _module = checked (config._module); - - (stack trace truncated; use '--show-trace' to show the full trace) - - error: syntax error, unexpected DOLLAR_CURLY - - at /etc/nixos/configuration.nix:270:24: - - 269| }; - 270| tabs.bar.bg = ${BG}; - | ^ - 271| }; building Nix... -error: - … while evaluating the attribute 'config' - - at /nix/var/nix/profiles/per-user/root/channels/nixos/lib/modules.nix:322:9: - - 321| options = checked options; - 322| config = checked (removeAttrs config [ "_module" ]); - | ^ - 323| _module = checked (config._module); - - … while calling the 'seq' builtin - - at /nix/var/nix/profiles/per-user/root/channels/nixos/lib/modules.nix:322:18: - - 321| options = checked options; - 322| config = checked (removeAttrs config [ "_module" ]); - | ^ - 323| _module = checked (config._module); - - (stack trace truncated; use '--show-trace' to show the full trace) - - error: syntax error, unexpected DOLLAR_CURLY - - at /etc/nixos/configuration.nix:270:24: - - 269| }; - 270| tabs.bar.bg = ${BG}; - | ^ - 271| }; building the system configuration... -error: - … while evaluating the attribute 'config.system.build.toplevel' - - at /nix/var/nix/profiles/per-user/root/channels/nixos/lib/modules.nix:322:9: - - 321| options = checked options; - 322| config = checked (removeAttrs config [ "_module" ]); - | ^ - 323| _module = checked (config._module); - - … while calling the 'seq' builtin - - at /nix/var/nix/profiles/per-user/root/channels/nixos/lib/modules.nix:322:18: - - 321| options = checked options; - 322| config = checked (removeAttrs config [ "_module" ]); - | ^ - 323| _module = checked (config._module); - - (stack trace truncated; use '--show-trace' to show the full trace) - - error: syntax error, unexpected DOLLAR_CURLY - - at /etc/nixos/configuration.nix:270:24: - - 269| }; - 270| tabs.bar.bg = ${BG}; - | ^ - 271| }; +activating the configuration... +setting up /etc... +reloading user units for lightdm... +reloading user units for deadvey... +restarting sysinit-reactivation.target