This commit is contained in:
2025-08-21 20:15:24 +01:00
parent d9ec914402
commit 195d2042ca
8 changed files with 82 additions and 71 deletions

36
flake.lock generated
View File

@@ -111,11 +111,11 @@
]
},
"locked": {
"lastModified": 1762791812,
"narHash": "sha256-O7Ne62r8hKE3FPqUsukMblxyYCFTh2jV5gHgIsI3rnE=",
"lastModified": 1763485342,
"narHash": "sha256-y5EvUixcCm8m28WOYnm/83cYiJ20FKWMf7pWqG0uY18=",
"owner": "cachix",
"repo": "devenv",
"rev": "1faab0d28c573f2a8dba2cf457b9d383adba252a",
"rev": "0c5eefb43412365b29b16ccf1690ff0e97b381ee",
"type": "github"
},
"original": {
@@ -340,11 +340,11 @@
]
},
"locked": {
"lastModified": 1762787259,
"narHash": "sha256-t2U/GLLXHa2+kJkwnFNRVc2fEJ/lUfyZXBE5iKzJdcs=",
"lastModified": 1763416652,
"narHash": "sha256-8EBEEvtzQ11LCxpQHMNEBQAGtQiCu/pqP9zSovDSbNM=",
"owner": "nix-community",
"repo": "home-manager",
"rev": "37a3d97f2873e0f68711117c34d04b7c7ead8f4e",
"rev": "ea164b7c9ccdc2321379c2ff78fd4317b4c41312",
"type": "github"
},
"original": {
@@ -362,11 +362,11 @@
]
},
"locked": {
"lastModified": 1762351818,
"narHash": "sha256-0ptUDbYwxv1kk/uzEX4+NJjY2e16MaAhtzAOJ6K0TG0=",
"lastModified": 1762964643,
"narHash": "sha256-RYHN8O/Aja59XDji6WSJZPkJpYVUfpSkyH+PEupBJqM=",
"owner": "nix-community",
"repo": "home-manager",
"rev": "b959c67241cae17fc9e4ee7eaf13dfa8512477ea",
"rev": "827f2a23373a774a8805f84ca5344654c31f354b",
"type": "github"
},
"original": {
@@ -460,11 +460,11 @@
},
"nixpkgs": {
"locked": {
"lastModified": 1762596750,
"narHash": "sha256-rXXuz51Bq7DHBlfIjN7jO8Bu3du5TV+3DSADBX7/9YQ=",
"lastModified": 1763421233,
"narHash": "sha256-Stk9ZYRkGrnnpyJ4eqt9eQtdFWRRIvMxpNRf4sIegnw=",
"owner": "NixOS",
"repo": "nixpkgs",
"rev": "b6a8526db03f735b89dd5ff348f53f752e7ddc8e",
"rev": "89c2b2330e733d6cdb5eae7b899326930c2c0648",
"type": "github"
},
"original": {
@@ -588,11 +588,11 @@
]
},
"locked": {
"lastModified": 1762748864,
"narHash": "sha256-YgQ80R6TW9GxS0Ozaqe9mTVewuOWqwRmMUhRUpKsoCs=",
"lastModified": 1763457799,
"narHash": "sha256-33hJpIuqbn/PHf4VCZAktxDCUxnWLOtMAOyAFd75O9E=",
"owner": "0xc000022070",
"repo": "zen-browser-flake",
"rev": "02bb5919dab81a3fea4d8d4663ea67922a463cd3",
"rev": "85bc80b9d8c8b22ed273163dd7c7adfad9287a5d",
"type": "github"
},
"original": {
@@ -608,11 +608,11 @@
"nixpkgs": "nixpkgs_2"
},
"locked": {
"lastModified": 1762735003,
"narHash": "sha256-F5mQBMc1fNZnyVzBWTB6RsSglWwpTTBekHxzPeGegD4=",
"lastModified": 1763468053,
"narHash": "sha256-cLItea10G9NL3VQbPZr1XaZNAOckqlQCGlA/tW1Pt3U=",
"owner": "mitchellh",
"repo": "zig-overlay",
"rev": "b4dc0184e0cff5094d4a746a5cd34ef30f6fdc12",
"rev": "79b585ca6635399de03c42124696427e314ff1fd",
"type": "github"
},
"original": {

View File

@@ -53,20 +53,8 @@
fontDir.enable = true;
};
specialisation = {
niri.configuration = {
programs.niri.enable = true;
};
plasma.configuration = {
boot.loader.systemd-boot.sortKey = "default";
services.blueman.enable = false;
services.desktopManager.plasma6.enable = true;
};
};
programs = {
sway.enable = true;
# niri.enable = true;
steam = {
enable = true;

View File

@@ -26,12 +26,14 @@
enable = true;
extraPackages = with pkgs; [
intel-media-driver
vaapiIntel
intel-vaapi-driver
];
};
programs.kdeconnect.enable = true;
programs.niri.enable = true;
# programs.virt-manager.enable = true;
# users.groups.libvirtd.members = ["daniel"];
@@ -45,6 +47,8 @@
interfaces.wlp170s0.useDHCP = true;
};
environment.pathsToLink = [ "/share/xdg-desktop-portal" "/share/applications" ];
services = {
fprintd.enable = true;

View File

@@ -38,6 +38,17 @@
wlr-randr
];
specialisation = {
niri.configuration = {
programs.niri.enable = true;
};
plasma.configuration = {
boot.loader.systemd-boot.sortKey = "default";
services.blueman.enable = false;
services.desktopManager.plasma6.enable = true;
};
};
security.pam.u2f = {
enable = true;
};

View File

@@ -223,6 +223,9 @@ layout {
// which may be more convenient to use.
// See the binds section below for more spawn examples.
// spawn-at-startup "alacritty" "-e" "fish"
spawn-at-startup "dbus-update-activation-environment" "--systemd" "DISPLAY" "WAYLAND_DISPLAY" "XDG_CURRENT_DESKTOP"
spawn-at-startup "systemctl" "--user" "import-environment" "PATH" "DISPLAY" "WAYLAND_DISPLAY"
spawn-at-startup "waybar"
spawn-at-startup "xwayland-satellite"

View File

@@ -1,33 +0,0 @@
font-family = Iosevka Nerd Font
font-size = 12
theme = catppuccin-macchiato
cursor-style = block
shell-integration-features = no-cursor
window-theme = ghostty
window-decoration = auto
working-directory = home
unfocused-split-opacity = 1
keybind = ctrl+shift+enter>ctrl+shift+h=new_split:left
keybind = ctrl+shift+enter>ctrl+shift+l=new_split:right
keybind = ctrl+shift+enter>ctrl+shift+k=new_split:up
keybind = ctrl+shift+enter>ctrl+shift+j=new_split:down
keybind = ctrl+shift+enter>h=new_split:left
keybind = ctrl+shift+enter>l=new_split:right
keybind = ctrl+shift+enter>k=new_split:up
keybind = ctrl+shift+enter>j=new_split:down
keybind = ctrl+shift+f=toggle_split_zoom
keybind = ctrl+shift+h=goto_split:left
keybind = ctrl+shift+l=goto_split:right
keybind = ctrl+shift+k=goto_split:top
keybind = ctrl+shift+j=goto_split:bottom
keybind = ctrl+shift+m=toggle_tab_overview
keybind = ctrl+shift+alt+r=reset

View File

@@ -4,11 +4,44 @@
hostname,
...
}: {
home.file.".config/ghostty/config" = {
source = ./config;
};
programs.ghostty = {
enable = true;
settings = {
font-family = "Iosevka Nerd Font";
font-size = 12;
theme = "Catppuccin Macchiato";
cursor-style = "block";
shell-integration-features = "no-cursor";
window-theme = "ghostty";
window-decoration = if hostname == "pingbox" then "none" else "auto";
working-directory = "home";
unfocused-split-opacity = 1;
keybind = [
"ctrl+shift+enter>ctrl+shift+h=new_split:left"
"ctrl+shift+enter>ctrl+shift+l=new_split:right"
"ctrl+shift+enter>ctrl+shift+k=new_split:up"
"ctrl+shift+enter>ctrl+shift+j=new_split:down"
"ctrl+shift+enter>h=new_split:left"
"ctrl+shift+enter>l=new_split:right"
"ctrl+shift+enter>k=new_split:up"
"ctrl+shift+enter>j=new_split:down"
"ctrl+shift+f=toggle_split_zoom"
"alt+enter=toggle_split_zoom"
"ctrl+shift+h=goto_split:left"
"ctrl+shift+l=goto_split:right"
"ctrl+shift+k=goto_split:top"
"ctrl+shift+j=goto_split:bottom"
"ctrl+shift+m=toggle_tab_overview"
"ctrl+shift+alt+r=reset"
];
};
};
}

View File

@@ -10,10 +10,10 @@
cliPackages = with pkgs; [
age
direnv
elixir_1_17
elixir
elixir-ls
entr
erlang_26
erlang
gnumake
go
gopls
@@ -47,7 +47,6 @@
_1password-cli
_1password-gui
calibre
deadbeef
discord
feh
fraunces
@@ -131,6 +130,7 @@ in {
extraPortals = with pkgs; [
xdg-desktop-portal-gtk
xdg-desktop-portal-wlr
xdg-desktop-portal-gnome
];
xdgOpenUsePortal = true;
config = {
@@ -142,6 +142,10 @@ in {
};
};
services.udiskie = {
enable = true;
};
programs = {
# Let Home Manager install and manage itself.
home-manager.enable = true;
@@ -157,6 +161,7 @@ in {
git = {
enable = true;
lfs.enable = true;
package = pkgs.gitFull;
settings = {
user.name = "Daniel Patterson";