WIP desktop config port to nix
This commit is contained in:
parent
a1cd2ed2d7
commit
280a559e01
GPG key ID:
5B2020A0F9921EF4
11 changed files with 455 additions and 158 deletions
|
|
@ -91,15 +91,15 @@ function _maybe_git_summary
|
|||
end
|
||||
|
||||
function _prompt_marker
|
||||
printf "%b133;A%b" "\x1b\x5d" "\x1b\x5c"
|
||||
# printf "%b133;A%b" "\x1b\x5d" "\x1b\x5c"
|
||||
end
|
||||
|
||||
function _prompt_continuation_marker
|
||||
printf "%b133;A;k=s%b" "\x1b\x5d" "\x1b\x5c"
|
||||
# printf "%b133;A;k=s%b" "\x1b\x5d" "\x1b\x5c"
|
||||
end
|
||||
|
||||
function cmd_marker --on-variable _
|
||||
printf "%b133;C%b" "\x1b\x5d" "\x1b\x5c"
|
||||
# printf "%b133;C%b" "\x1b\x5d" "\x1b\x5c"
|
||||
end
|
||||
|
||||
function _prompt_prefix
|
||||
|
|
|
|||
14
flake.lock
14
flake.lock
|
|
@ -178,16 +178,15 @@
|
|||
]
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1693208669,
|
||||
"narHash": "sha256-hHFaaUsZ860wvppPeiu7nJn/nXZjJfnqAQEu9SPFE9I=",
|
||||
"lastModified": 1695984718,
|
||||
"narHash": "sha256-LQwKgaaaFOkIcxarf0xQXeDJFwZ5BZWcgmPeo3xp2CM=",
|
||||
"owner": "nix-community",
|
||||
"repo": "home-manager",
|
||||
"rev": "5bac4a1c06cd77cf8fc35a658ccb035a6c50cd2c",
|
||||
"rev": "4f02e35f9d150573e1a710afa338846c2f6d850c",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
"owner": "nix-community",
|
||||
"ref": "release-23.05",
|
||||
"repo": "home-manager",
|
||||
"type": "github"
|
||||
}
|
||||
|
|
@ -258,16 +257,15 @@
|
|||
},
|
||||
"nixpkgs_4": {
|
||||
"locked": {
|
||||
"lastModified": 1692794066,
|
||||
"narHash": "sha256-H0aG8r16dj0x/Wz6wQhQxc9V7AsObOiHPaKxQgH6Y08=",
|
||||
"lastModified": 1696018110,
|
||||
"narHash": "sha256-eLB8ruJGmDiSO4ysDZOkDq3tkzuRT77tXKmfHN5nBa4=",
|
||||
"owner": "NixOS",
|
||||
"repo": "nixpkgs",
|
||||
"rev": "fc944919f743bb22379dddf18dcb72db6cff84aa",
|
||||
"rev": "ae95a37b32e51fe3b5d89ce6bf037ec188c5560a",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
"owner": "NixOS",
|
||||
"ref": "nixos-23.05",
|
||||
"repo": "nixpkgs",
|
||||
"type": "github"
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1,11 +1,11 @@
|
|||
{
|
||||
inputs = {
|
||||
nixpkgs.url = "github:NixOS/nixpkgs/nixos-23.05";
|
||||
nixpkgs.url = "github:NixOS/nixpkgs";
|
||||
utils.url = "github:gytis-ivaskevicius/flake-utils-plus";
|
||||
# nixpkgs-unstable.url = "github:NixOS/nixpkgs/nixpkgs-channels/nixos-unstable";
|
||||
api-lyte-dev.url = "git+ssh://gitea@git.lyte.dev/lytedev/api.lyte.dev.git";
|
||||
home-manager = {
|
||||
url = "github:nix-community/home-manager/release-23.05";
|
||||
url = "github:nix-community/home-manager";
|
||||
inputs.nixpkgs.follows = "nixpkgs";
|
||||
inputs.utils.follows = "utils";
|
||||
};
|
||||
|
|
|
|||
214
home/linux.nix
214
home/linux.nix
|
|
@ -1,10 +1,207 @@
|
|||
{ pkgs, ... }: {
|
||||
{ config, pkgs, ... }: {
|
||||
home.pointerCursor = {
|
||||
name = "Catppuccin-Mocha-Sapphire-Cursors";
|
||||
package = pkgs.catppuccin-cursors.mochaSapphire;
|
||||
size = 64; # TODO: this doesn't seem to work -- at least in Sway
|
||||
};
|
||||
|
||||
services = {
|
||||
mako = {
|
||||
enable = true;
|
||||
};
|
||||
};
|
||||
|
||||
wayland.windowManager.sway = {
|
||||
enable = true;
|
||||
|
||||
systemd = {
|
||||
enable = true;
|
||||
};
|
||||
|
||||
config = {
|
||||
output = {
|
||||
"*" = {
|
||||
background = "$HOME/.wallpaper fill";
|
||||
};
|
||||
};
|
||||
|
||||
# TODO: popup_during_fullscreen smart
|
||||
focus = {
|
||||
wrapping = "yes";
|
||||
followMouse = "no";
|
||||
mouseWarping = false;
|
||||
};
|
||||
|
||||
modifier = "Mod4";
|
||||
|
||||
gaps = {
|
||||
smartBorders = "on";
|
||||
};
|
||||
|
||||
window = {
|
||||
border = 2;
|
||||
};
|
||||
|
||||
floating = {
|
||||
modifier = config.wayland.windowManager.sway.config.modifier;
|
||||
titlebar = false;
|
||||
};
|
||||
|
||||
startup = [
|
||||
{ command = "systemctl --user restart waybar"; always = true; }
|
||||
{ command = "firefox"; always = true; }
|
||||
{ command = "kitty --single-instance"; always = true; }
|
||||
];
|
||||
|
||||
modes = {
|
||||
resize = {
|
||||
"h" = "resize shrink width 10 px or 10 ppt";
|
||||
"j" = "resize grow height 10 px or 10 ppt";
|
||||
"k" = "resize shrink height 10 px or 10 ppt";
|
||||
"l" = "resize grow width 10 px or 10 ppt";
|
||||
|
||||
"left" = "resize shrink width 10 px or 10 ppt";
|
||||
"down" = "resize grow height 10 px or 10 ppt";
|
||||
"up" = "resize shrink height 10 px or 10 ppt";
|
||||
"right" = "resize grow width 10 px or 10 ppt";
|
||||
|
||||
"return" = ''mode "default"'';
|
||||
"escape" = ''mode "default"'';
|
||||
};
|
||||
};
|
||||
|
||||
input = {
|
||||
"type:keyboard" = {
|
||||
xkb_options = "ctrl:nocaps";
|
||||
repeat_delay = "200";
|
||||
repeat_rate = "60";
|
||||
};
|
||||
|
||||
"type:pointer" = {
|
||||
accel_profile = "flat";
|
||||
pointer_accel = "0";
|
||||
};
|
||||
|
||||
"type:touchpad" = {
|
||||
dwt = "disabled";
|
||||
tap = "enabled";
|
||||
natural_scroll = "enabled";
|
||||
middle_emulation = "enabled";
|
||||
# pointer_accel
|
||||
};
|
||||
|
||||
};
|
||||
keybindings = let mod = config.wayland.windowManager.sway.config.modifier; in {
|
||||
# bindsym $mod+shift+space exec wofi --show drun
|
||||
"${mod}+control+space" = "exec makoctl dismiss";
|
||||
"${mod}+shift+space" = "exec makoctl invoke";
|
||||
"${mod}+return" = "exec kitty --single-instance";
|
||||
"${mod}+shift+return" = "exec floating-term";
|
||||
"${mod}+shift+alt+return" = "exec kitty";
|
||||
"${mod}+c" = "kill";
|
||||
"${mod}+shift+c" = "kill # TODO: kill -9?";
|
||||
"${mod}+space" = "exec wofi --show drun";
|
||||
"${mod}+shift+s" = "exec clipshot";
|
||||
"${mod}+e" = "exec thunar";
|
||||
"${mod}+shift+r" = "reload";
|
||||
"${mod}+control+Escape" = "exit";
|
||||
"${mod}+shift+e" = "exit";
|
||||
"${mod}+shift+p" = "exec pass-chooser";
|
||||
"${mod}+control+j" = "split v";
|
||||
"${mod}+control+l" = "split h";
|
||||
"${mod}+control+f" = "focus mode_toggle";
|
||||
|
||||
"${mod}+h" = "focus left";
|
||||
"${mod}+j" = "focus down";
|
||||
"${mod}+k" = "focus up";
|
||||
"${mod}+l" = "focus right";
|
||||
|
||||
"${mod}+left" = "focus left";
|
||||
"${mod}+down" = "focus down";
|
||||
"${mod}+up" = "focus up";
|
||||
"${mod}+right" = "focus right";
|
||||
|
||||
"${mod}+shift+h" = "move left";
|
||||
"${mod}+shift+j" = "move down";
|
||||
"${mod}+shift+k" = "move up";
|
||||
"${mod}+shift+l" = "move right";
|
||||
|
||||
"${mod}+shift+left" = "move left";
|
||||
"${mod}+shift+down" = "move down";
|
||||
"${mod}+shift+up" = "move up";
|
||||
"${mod}+shift+right" = "move right";
|
||||
|
||||
"${mod}+1" = "workspace 1";
|
||||
"${mod}+2" = "workspace 2";
|
||||
"${mod}+3" = "workspace 3";
|
||||
"${mod}+4" = "workspace 4";
|
||||
"${mod}+5" = "workspace 5";
|
||||
"${mod}+6" = "workspace 6";
|
||||
"${mod}+7" = "workspace 7";
|
||||
"${mod}+8" = "workspace 8";
|
||||
"${mod}+9" = "workspace 9";
|
||||
"${mod}+0" = "workspace 10";
|
||||
|
||||
"${mod}+shift+1" = "move container to workspace 1";
|
||||
"${mod}+shift+2" = "move container to workspace 2";
|
||||
"${mod}+shift+3" = "move container to workspace 3";
|
||||
"${mod}+shift+4" = "move container to workspace 4";
|
||||
"${mod}+shift+5" = "move container to workspace 5";
|
||||
"${mod}+shift+6" = "move container to workspace 6";
|
||||
"${mod}+shift+7" = "move container to workspace 7";
|
||||
"${mod}+shift+8" = "move container to workspace 8";
|
||||
"${mod}+shift+9" = "move container to workspace 9";
|
||||
"${mod}+shift+0" = "move container to workspace 10";
|
||||
|
||||
"${mod}+b" = "splith";
|
||||
"${mod}+v" = "splitv";
|
||||
|
||||
"${mod}+shift+f" = "fullscreen toggle";
|
||||
"${mod}+f" = "floating toggle";
|
||||
"${mod}+s" = "floating disable";
|
||||
"${mod}+alt+f" = "focus mode_toggle";
|
||||
"${mod}+p" = "focus parent";
|
||||
"${mod}+period" = "focus child";
|
||||
"${mod}+comma" = "focus child";
|
||||
"${mod}+tab" = "workspace back_and_forth";
|
||||
|
||||
"${mod}+minus" = "gaps inner current minus 5";
|
||||
"${mod}+plus" = "gaps inner current plus 5";
|
||||
"${mod}+control+alt+h" = "gaps horizontal current minus 5";
|
||||
"${mod}+control+alt+l" = "gaps horizontal current plus 5";
|
||||
"${mod}+control+alt+j" = "gaps vertical current minus 5";
|
||||
"${mod}+control+alt+k" = "gaps vertical current plus 5";
|
||||
|
||||
# TODO: this should also reset the horizontal and vertical gaps?
|
||||
"${mod}+control+equal" = "gaps inner current set 0";
|
||||
|
||||
"XF86AudioRaiseVolume" = "exec pactl set-sink-volume @DEFAULT_SINK@ +5%";
|
||||
"XF86AudioLowerVolume" = "exec pactl set-sink-volume @DEFAULT_SINK@ -5%";
|
||||
"control+XF86AudioRaiseVolume" = "exec pactl set-sink-volume @DEFAULT_SINK@ +1%";
|
||||
"control+XF86AudioLowerVolume" = "exec pactl set-sink-volume @DEFAULT_SINK@ -1%";
|
||||
"XF86AudioMute" = "exec pactl set-sink-mute @DEFAULT_SINK@ toggle";
|
||||
"XF86AudioMicMute" = "exec pactl set-source-mute @DEFAULT_SOURCE@ toggle";
|
||||
"XF86MonBrightnessDown" = "exec brightnessctl set 10%-";
|
||||
"XF86MonBrightnessUp" = "exec brightnessctl set +10%";
|
||||
"shift+XF86MonBrightnessDown" = "exec brightnessctl set 1%";
|
||||
"shift+XF86MonBrightnessUp" = "exec brightnessctl set 100%";
|
||||
"control+XF86MonBrightnessDown" = "exec brightnessctl set 1%-";
|
||||
"control+XF86MonBrightnessUp" = "exec brightnessctl set +1%";
|
||||
"XF86AudioPlay" = "exec playerctl play-pause";
|
||||
"XF86AudioNext" = "exec playerctl next";
|
||||
"XF86AudioPrev" = "exec playerctl previous";
|
||||
"${mod}+shift+v" = "exec pactl set-source-mute @DEFAULT_SOURCE@ toggle";
|
||||
|
||||
"${mod}+control+shift+l" = "exec swaylock";
|
||||
|
||||
"${mod}+shift+alt+f" = "for_window [class=$tilers] floating toggle";
|
||||
};
|
||||
assigns = { };
|
||||
bars = [ ];
|
||||
colors = { };
|
||||
};
|
||||
};
|
||||
|
||||
gtk = {
|
||||
enable = true;
|
||||
theme = {
|
||||
|
|
@ -22,7 +219,19 @@
|
|||
(pkgs.buildEnv { name = "my-linux-scripts"; paths = [ ../scripts/linux ]; })
|
||||
];
|
||||
|
||||
programs.firefox = {
|
||||
programs = {
|
||||
waybar = {
|
||||
enable = true;
|
||||
# settings = { };
|
||||
# style = ''
|
||||
# '';
|
||||
systemd = {
|
||||
enable = true;
|
||||
};
|
||||
};
|
||||
|
||||
firefox = {
|
||||
# TODO: this should be able to work on macos, no?
|
||||
# TODO: enable dark theme by default
|
||||
enable = true;
|
||||
|
||||
|
|
@ -70,4 +279,5 @@
|
|||
};
|
||||
};
|
||||
};
|
||||
};
|
||||
}
|
||||
|
|
|
|||
192
home/user.nix
192
home/user.nix
|
|
@ -1,4 +1,4 @@
|
|||
{ pkgs, lib, ... }:
|
||||
{ config, pkgs, lib, ... }:
|
||||
let
|
||||
email = "daniel@lyte.dev";
|
||||
name = "Daniel Flanagan";
|
||||
|
|
@ -14,7 +14,7 @@ in
|
|||
home = {
|
||||
username = lib.mkDefault "daniel";
|
||||
homeDirectory = lib.mkDefault "/home/daniel/.home";
|
||||
stateVersion = "23.05";
|
||||
stateVersion = "23.11";
|
||||
|
||||
packages = [
|
||||
# I use rtx for managing the following programs' versions instead of nix:
|
||||
|
|
@ -406,6 +406,177 @@ in
|
|||
};
|
||||
};
|
||||
|
||||
kitty = {
|
||||
enable = true;
|
||||
darwinLaunchOptions = [ "--single-instance" ];
|
||||
shellIntegration = {
|
||||
enableFishIntegration = true;
|
||||
};
|
||||
settings = {
|
||||
"font_family" = "IosevkaLyteTerm";
|
||||
"bold_font" = "IosevkaLyteTerm Heavy";
|
||||
"italic_font" = "IosevkaLyteTerm Italic";
|
||||
"bold_italic_font" = "IosevkaLyteTerm Heavy Italic";
|
||||
"font_size" = "12.5";
|
||||
"inactive_text_alpha" = "0.5";
|
||||
"copy_on_select" = true;
|
||||
|
||||
"scrollback_lines" = 500000;
|
||||
|
||||
"symbol_map" = "U+23FB-U+23FE,U+2665,U+26A1,U+2B58,U+E000-U+E00A,U+E0A0-U+E0A3,U+E0B0-U+E0D4,U+E200-U+E2A9,U+E300-U+E3E3,U+E5FA-U+E6AA,U+E700-U+E7C5,U+EA60-U+EBEB,U+F000-U+F2E0,U+F300-U+F32F,U+F400-U+F4A9,U+F500-U+F8FF,U+F0001-U+F1AF0 Symbols Nerd Font Mono";
|
||||
|
||||
# use `kitty + list-fonts --psnames` to get the font's PostScript name
|
||||
|
||||
"allow_remote_control" = true;
|
||||
"listen_on" = "unix:/tmp/kitty";
|
||||
"repaint_delay" = 3;
|
||||
"input_delay" = 3;
|
||||
"sync_to_monitor" = true;
|
||||
|
||||
"adjust_line_height" = 0;
|
||||
"window_padding_width" = "10.0";
|
||||
"window_margin_width" = "0.0";
|
||||
|
||||
"confirm_os_window_close" = 0;
|
||||
|
||||
"enabled_layouts" = "splits:split_axis=vertical,stack";
|
||||
|
||||
"shell_integration" = "disabled";
|
||||
|
||||
"enable_audio_bell" = true;
|
||||
"visual_bell_duration" = "0.25";
|
||||
"visual_bell_color" = "#333033";
|
||||
|
||||
"url_style" = "single";
|
||||
|
||||
"strip_trailing_spaces" = "smart";
|
||||
|
||||
# open_url_modifiers ctrl
|
||||
|
||||
"tab_bar_align" = "center";
|
||||
"tab_bar_style" = "separator";
|
||||
"tab_separator" = '''';
|
||||
"tab_bar_edge" = "top";
|
||||
"tab_title_template" = ''{fmt.fg.tab}{fmt.bg.tab} {activity_symbol}{title}'';
|
||||
"active_tab_font_style" = "normal";
|
||||
|
||||
## name: Catppuccin Kitty Mocha
|
||||
## author: Catppuccin Org
|
||||
## license: MIT
|
||||
## upstream: https://github.com/catppuccin/kitty/blob/main/mocha.conf
|
||||
## blurb: Soothing pastel theme for the high-spirited!
|
||||
|
||||
# The basic colors
|
||||
"foreground" = "#CDD6F4";
|
||||
"background" = "#1E1E2E";
|
||||
"selection_foreground" = "#1E1E2E";
|
||||
"selection_background" = "#F5E0DC";
|
||||
|
||||
# Cursor colors
|
||||
"cursor" = "#F5E0DC";
|
||||
"cursor_text_color" = "#1E1E2E";
|
||||
|
||||
# URL underline color when hovering with mouse
|
||||
"url_color" = "#F5E0DC";
|
||||
|
||||
# Kitty window border colors
|
||||
"active_border_color" = "#74c7ec";
|
||||
"inactive_border_color" = "#313244";
|
||||
"bell_border_color" = "#F9E2AF";
|
||||
|
||||
# OS Window titlebar colors
|
||||
"wayland_titlebar_color" = "system";
|
||||
"macos_titlebar_color" = "system";
|
||||
|
||||
# Tab bar colors
|
||||
"active_tab_foreground" = "#11111B";
|
||||
"active_tab_background" = "#74c7ec";
|
||||
"inactive_tab_foreground" = "#CDD6F4";
|
||||
"inactive_tab_background" = "#181825";
|
||||
"tab_bar_background" = "#11111B";
|
||||
|
||||
# Colors for marks (marked text in the terminal)
|
||||
"mark1_foreground" = "#1E1E2E";
|
||||
"mark1_background" = "#B4BEFE";
|
||||
"mark2_foreground" = "#1E1E2E";
|
||||
"mark2_background" = "#74c7ec";
|
||||
"mark3_foreground" = "#1E1E2E";
|
||||
"mark3_background" = "#74C7EC";
|
||||
|
||||
# The 16 terminal colors
|
||||
|
||||
# black
|
||||
"color0" = "#45475A";
|
||||
"color8" = "#585B70";
|
||||
|
||||
# red
|
||||
"color1" = "#F38BA8";
|
||||
"color9" = "#F38BA8";
|
||||
|
||||
# green
|
||||
"color2" = "#A6E3A1";
|
||||
"color10" = "#A6E3A1";
|
||||
|
||||
# yellow
|
||||
"color3" = "#F9E2AF";
|
||||
"color11" = "#F9E2AF";
|
||||
|
||||
# blue
|
||||
"color4" = "#89B4FA";
|
||||
"color12" = "#89B4FA";
|
||||
|
||||
# magenta
|
||||
"color5" = "#F5C2E7";
|
||||
"color13" = "#F5C2E7";
|
||||
|
||||
# cyan
|
||||
"color6" = "#94E2D5";
|
||||
"color14" = "#94E2D5";
|
||||
|
||||
# white
|
||||
"color7" = "#BAC2DE";
|
||||
"color15" = "#A6ADC8";
|
||||
};
|
||||
keybindings = {
|
||||
"ctrl+shift+1" = "change_font_size all 12.5";
|
||||
"ctrl+shift+2" = "change_font_size all 18.5";
|
||||
"ctrl+shift+3" = "change_font_size all 26";
|
||||
"ctrl+shift+4" = "change_font_size all 32";
|
||||
"ctrl+shift+5" = "change_font_size all 48";
|
||||
"ctrl+shift+o" = "launch --type=tab --stdin-source=@screen_scrollback $EDITOR";
|
||||
|
||||
"ctrl+shift+equal" = "change_font_size all +0.5";
|
||||
"ctrl+shift+minus" = "change_font_size all -0.5";
|
||||
|
||||
"shift+insert" = "paste_from_clipboard";
|
||||
"ctrl+shift+v" = "paste_from_selection";
|
||||
"ctrl+shift+c" = "copy_to_clipboard";
|
||||
|
||||
# kill pane
|
||||
"ctrl+shift+q" = "close_window";
|
||||
|
||||
# kill tab
|
||||
"ctrl+alt+shift+q" = "close_tab";
|
||||
|
||||
"ctrl+shift+j" = "launch --location=hsplit --cwd=current";
|
||||
"ctrl+shift+l" = "launch --location=vsplit --cwd=current";
|
||||
|
||||
"ctrl+alt+shift+k" = "move_window up";
|
||||
"ctrl+alt+shift+h" = "move_window left";
|
||||
"ctrl+alt+shift+l" = "move_window right";
|
||||
"ctrl+alt+shift+j" = "move_window down";
|
||||
|
||||
"ctrl+h" = "neighboring_window left";
|
||||
"ctrl+l" = "neighboring_window right";
|
||||
"ctrl+k" = "neighboring_window up";
|
||||
"ctrl+j" = "neighboring_window down";
|
||||
"ctrl+shift+n" = "nth_window -1";
|
||||
"ctrl+shift+space>u" = "kitten hints --type=url --program @";
|
||||
|
||||
"ctrl+shift+z" = "toggle_layout stack";
|
||||
};
|
||||
};
|
||||
|
||||
zellij = {
|
||||
# TODO: enable after port config
|
||||
enable = false;
|
||||
|
|
@ -575,12 +746,12 @@ in
|
|||
shellAbbrs = { };
|
||||
shellAliases = {
|
||||
l = "br";
|
||||
ls = "exa --group-directories-first --classify";
|
||||
la = "exa -la --group-directories-first --classify";
|
||||
lA = "exa -la --all --group-directories-first --classify";
|
||||
tree = "exa --tree --level=3";
|
||||
lt = "exa -l --sort=modified";
|
||||
lat = "exa -la --sort=modified";
|
||||
ls = "eza --group-directories-first --classify";
|
||||
la = "eza -la --group-directories-first --classify";
|
||||
lA = "eza -la --all --group-directories-first --classify";
|
||||
tree = "eza --tree --level=3";
|
||||
lt = "eza -l --sort=modified";
|
||||
lat = "eza -la --sort=modified";
|
||||
lc = "lt --sort=accessed";
|
||||
lT = "lt --reverse";
|
||||
lC = "lc --reverse";
|
||||
|
|
@ -609,7 +780,7 @@ in
|
|||
};
|
||||
};
|
||||
|
||||
exa = {
|
||||
eza = {
|
||||
enable = true;
|
||||
};
|
||||
|
||||
|
|
@ -624,9 +795,6 @@ in
|
|||
};
|
||||
};
|
||||
|
||||
# wayland.windowManager.sway = {
|
||||
# enable = true;
|
||||
# }; # TODO: would be nice to have my sway config declared here instead of symlinked in by dotfiles scripts?
|
||||
# maybe we can share somehow so things for nix-y systems and non-nix-y systems alike
|
||||
# am I going to _have_ non-nix systems anymore?
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1,4 +1,5 @@
|
|||
{ ... }: {
|
||||
# TODO: add a DE and include either plasma or gnome as a fallback?
|
||||
imports = [
|
||||
./sway.nix
|
||||
./user-installed-applications.nix
|
||||
|
|
|
|||
|
|
@ -77,6 +77,7 @@ in
|
|||
};
|
||||
|
||||
systemPackages = with pkgs; [
|
||||
# TODO: converge with home manager/sway stuff?
|
||||
brightnessctl
|
||||
feh
|
||||
gimp
|
||||
|
|
@ -87,7 +88,6 @@ in
|
|||
libinput-gestures
|
||||
libnotify
|
||||
lutris
|
||||
mako
|
||||
nil
|
||||
nixpkgs-fmt
|
||||
noto-fonts
|
||||
|
|
|
|||
15
nixos.nix
15
nixos.nix
|
|
@ -42,17 +42,18 @@ in
|
|||
{
|
||||
scheme = "unencrypted";
|
||||
disks = [ "/dev/sda" ];
|
||||
} ++ [
|
||||
./nixos/musicbox.nix
|
||||
]);
|
||||
} ++ [ ./nixos/musicbox.nix ]);
|
||||
|
||||
thinker = nixosSystem "x86_64-linux" (disko
|
||||
{
|
||||
scheme = "standard";
|
||||
disks = [ "/dev/nvme0n1" ];
|
||||
name = "vdb";
|
||||
} ++ [
|
||||
./nixos/thinker.nix
|
||||
]);
|
||||
# dragon = diskoNixosSystem self.diskoConfigurations.standard [ "/dev/disk/by-uuid/asdf" ] [ ./nixos/dragon.nix ];
|
||||
} ++ [ ./nixos/thinker.nix ]);
|
||||
|
||||
dragon = nixosSystem "x86_64-linux" (disko
|
||||
{
|
||||
scheme = "standard";
|
||||
disks = [ "/dev/disk/by-uuid/asdf" ];
|
||||
} ++ [ ./nixos/dragon.nix ]);
|
||||
}
|
||||
|
|
|
|||
|
|
@ -27,7 +27,7 @@ in
|
|||
curl
|
||||
dog
|
||||
dua
|
||||
exa
|
||||
eza
|
||||
fd
|
||||
file
|
||||
gnumake
|
||||
|
|
@ -37,7 +37,6 @@ in
|
|||
iputils
|
||||
jq
|
||||
killall
|
||||
kitty # TODO: I really just need the terminfo on servers, though, right?
|
||||
less
|
||||
mosh
|
||||
nmap
|
||||
|
|
|
|||
|
|
@ -123,86 +123,6 @@ in
|
|||
|
||||
services.dbus.enable = true;
|
||||
|
||||
environment.systemPackages = with pkgs; [
|
||||
age
|
||||
bat
|
||||
bind
|
||||
bottom
|
||||
brightnessctl
|
||||
clang
|
||||
curl
|
||||
delta
|
||||
dog
|
||||
dtach
|
||||
dua
|
||||
exa
|
||||
fd
|
||||
feh
|
||||
file
|
||||
fwupd
|
||||
gcc
|
||||
gimp
|
||||
git
|
||||
git-lfs
|
||||
grim
|
||||
hexyl
|
||||
htop
|
||||
inkscape
|
||||
inotify-tools
|
||||
iputils
|
||||
killall
|
||||
kitty
|
||||
krita
|
||||
libinput
|
||||
libinput-gestures
|
||||
libnotify
|
||||
lutris
|
||||
gnumake
|
||||
mako
|
||||
mosh
|
||||
nmap
|
||||
nnn
|
||||
nil
|
||||
nixpkgs-fmt
|
||||
noto-fonts
|
||||
openssl
|
||||
pamixer
|
||||
pavucontrol
|
||||
pciutils
|
||||
pgcli
|
||||
playerctl
|
||||
podman-compose
|
||||
pulseaudio
|
||||
pulsemixer
|
||||
rclone
|
||||
restic
|
||||
ripgrep
|
||||
rsync
|
||||
sd
|
||||
slurp
|
||||
sops
|
||||
steam
|
||||
swaybg
|
||||
swayidle
|
||||
swaylock
|
||||
tmux
|
||||
traceroute
|
||||
unzip
|
||||
vlc
|
||||
vulkan-tools
|
||||
watchexec
|
||||
waybar
|
||||
wget
|
||||
wireplumber
|
||||
wine
|
||||
wl-clipboard
|
||||
wofi
|
||||
xh
|
||||
zathura
|
||||
zellij
|
||||
zstd
|
||||
];
|
||||
|
||||
services.pcscd.enable = true;
|
||||
services.flatpak.enable = true;
|
||||
services.gnome.gnome-keyring.enable = true;
|
||||
|
|
|
|||
|
|
@ -37,6 +37,6 @@
|
|||
};
|
||||
};
|
||||
|
||||
system.stateVersion = "23.05";
|
||||
system.stateVersion = "23.11";
|
||||
}
|
||||
|
||||
|
|
|
|||
Loading…
Reference in a new issue