deadvey/nixos
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

540 current 2024-08-27 15:11:05 24.05.3999.c42fcfbdfeae 6.6.46 *

Browse Source
This commit is contained in:
deadvey 2024-08-27 15:15:40 +01:00
parent 3d6ddb29d9
commit d59923fbb7
3 changed files with 69 additions and 122 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

97
configuration.nix
View File

@ -7,16 +7,18 @@ let
BORDER_WIDTH = "2"; BORDER_WIDTH = "2";
BORDER_WIDTH_INT = 2; BORDER_WIDTH_INT = 2;
CORNER_RADIUS = "10"; CORNER_RADIUS = "0";
CORNER_RADIUS_INT = 10; CORNER_RADIUS_INT = 0;
# Curves of 2px and 10px radius fits into a curve of 12px radius do border_width+ corner_radius # 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_IN = "3";
GAPS_OUT = "20"; GAPS_OUT = "6";
HALF_OF_GAPS_OUT = "10"; HALF_OF_GAPS_OUT = "3";
WALLPAPER = "$HOME/media/Pictures/wallpapers/forest.jpg"; BAR_WIDTH_INT = 15;
WALLPAPER = "$HOME/Pictures/wallpapers/forest.jpg";
# Colours # Colours
BG = "282828"; BG = "282828";
@ -91,6 +93,7 @@ in
LC_TELEPHONE = "en_GB.UTF-8"; LC_TELEPHONE = "en_GB.UTF-8";
LC_TIME = "en_GB.UTF-8"; LC_TIME = "en_GB.UTF-8";
}; };
services.xserver = { services.xserver = {
enable = true; enable = true;
desktopManager = { desktopManager = {
@ -106,11 +109,19 @@ in
xkb.variant = ""; xkb.variant = "";
}; };
programs.ydotool.enable = true;
# Configure console keymap # Configure console keymap
console.keyMap = "uk"; console.keyMap = "uk";
# Enable CUPS to print documents. # Enable CUPS to print documents.
services.printing.enable = true; services.printing.enable = true;
services.avahi = {
enable = true;
nssmdns4 = true;
openFirewall = true;
};
# Enable sound with pipewire. # Enable sound with pipewire.
sound.enable = true; sound.enable = true;
@ -141,24 +152,25 @@ in
users.users.deadvey = { users.users.deadvey = {
isNormalUser = true; isNormalUser = true;
description = "Dave Smith"; description = "Dave Smith";
extraGroups = [ "networkmanager" "wheel" ]; extraGroups = [ "networkmanager" "wheel" "ydotool" ];
}; };
home-manager.users.deadvey = { pkgs, ... }: { home-manager.users.deadvey = { pkgs, ... }: {
home.packages = with pkgs; [ home.packages = with pkgs; [
thunderbird thunderbird
gramps gramps
librewolf graphviz
xonotic qutebrowser
libreoffice libreoffice
gimp gimp
ladybird freetube
ace-of-penguins
okular
xonotic
keepassxc keepassxc
tor-browser tor-browser
gruvbox-plus-icons gruvbox-plus-icons
gruvbox-gtk-theme gruvbox-gtk-theme
#emacsPackages.ement # Element client for emacs
cinny-desktop cinny-desktop
crosswords
]; ];
wayland.windowManager.hyprland.enable = true; 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 = { xdg.mimeApps = {
enable = true; enable = true;
defaultApplications = { defaultApplications = {
@ -246,16 +248,30 @@ in
enable = true; enable = true;
shellAliases= { shellAliases= {
emacs="emacs -nw"; 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"; ls="eza -l";
l="lsd"; l="lsd";
}; };
bashrcExtra = bashrcExtra =
''fastfetch ''fastfetch
XDG_SCREENSHOTS_DIR="$HOME/media/Pictures/other/Screenshots" XDG_SCREENSHOTS_DIR="$HOME/Pictures/other/Screenshots"
export XDG_SCREENSHOTS_DIR 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 > "''; 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 = { programs.kitty = {
enable = true; enable = true;
settings = { settings = {
@ -573,7 +589,7 @@ valign = bottom
# Put a picture of choice here. Default is the current wallpaper # Put a picture of choice here. Default is the current wallpaper
image { image {
path = $HOME/media/Pictures/other/steampunk.jpg path = $HOME/Pictures/other/steampunk.jpg
size = 230 size = 230
rounding = -1 rounding = -1
border_size = 2 border_size = 2
@ -612,12 +628,12 @@ valign = bottom
"$mod SHIFT, right, movewindow, r" "$mod SHIFT, right, movewindow, r"
"$mod SHIFT, up, movewindow, u" "$mod SHIFT, up, movewindow, u"
"$mod SHIFT, down, movewindow, d" "$mod SHIFT, down, movewindow, d"
"$mod, P, exec, grimshot savecopy area" ",Print, exec, grimshot savecopy area"
"$mod CONTROL, left, resizeactive, -20 0" "$mod CONTROL, left, resizeactive, -20 0"
"$mod CONTROL, right, resizeactive, 20 0" "$mod CONTROL, right, resizeactive, 20 0"
"$mod CONTROL, up, resizeactive, 0 -20" "$mod CONTROL, up, resizeactive, 0 -20"
"$mod CONTROL, down, 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: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:68, exec, pactl set-sink-volume @DEFAULT_SINK@ -5%"
"$mod, code:69, 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:72, exec, cmus-remote --prev"
"$mod, code:73, exec, cmus-remote --play" "$mod, code:73, exec, cmus-remote --play"
"$mod, code:74, exec, cmus-remote --next" "$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 # workspaces
@ -661,6 +688,7 @@ valign = bottom
wayland.windowManager.hyprland.extraConfig = '' wayland.windowManager.hyprland.extraConfig = ''
exec-once=hyprpaper exec-once=hyprpaper
exec-once=waybar exec-once=waybar
exec-once=gammastep -O 3000k
''; '';
programs.waybar = { programs.waybar = {
@ -689,7 +717,7 @@ valign = bottom
position = "top"; position = "top";
mode = "overlay"; mode = "overlay";
exclusive = "true"; exclusive = "true";
height = 30; height = BAR_WIDTH_INT;
width = 1000; width = 1000;
margin-top = 0; margin-top = 0;
margin-bottom = 0; margin-bottom = 0;
@ -749,7 +777,7 @@ valign = bottom
layer = "top"; layer = "top";
position = "bottom"; position = "bottom";
mode = "overlay"; mode = "overlay";
height = 30; height = BAR_WIDTH_INT;
width = 1000; width = 1000;
margin-top = 0; margin-top = 0;
margin-bottom = 0; margin-bottom = 0;
@ -973,15 +1001,16 @@ valign = bottom
mpv mpv
killall killall
zip zip
ncmpcpp ntfs3g
mpd ydotool
gammastep # Filters out blue light
libnotify
pulseaudio pulseaudio
nerdfonts
eza eza
spotdl
]; ];
fonts.packages = with pkgs; [ fonts.packages = with pkgs; [
nerdfonts
noto-fonts noto-fonts
noto-fonts-cjk noto-fonts-cjk
noto-fonts-emoji noto-fonts-emoji

2
edit-config.sh
View File

@ -2,7 +2,7 @@ sudo emacs /etc/nixos/configuration.nix -nw
sudo nixos-rebuild switch &>nixos-switch.log || ( sudo nixos-rebuild switch &>nixos-switch.log || (
cat nixos-switch.log | grep --color error && false) cat nixos-switch.log | grep --color error && false)
gen=$(nixos-rebuild list-generations | grep current) 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 add .
git commit -m "$gen" git commit -m "$gen"
if grep -q "error" nixos-switch.log; then if grep -q "error" nixos-switch.log; then

92
nixos-switch.log
View File

@ -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... 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... building the system configuration...
error: activating the configuration...
… while evaluating the attribute 'config.system.build.toplevel' setting up /etc...
reloading user units for lightdm...
at /nix/var/nix/profiles/per-user/root/channels/nixos/lib/modules.nix:322:9: reloading user units for deadvey...
restarting sysinit-reactivation.target
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| };