2026-01-27
This commit is contained in:
@@ -62,12 +62,29 @@
|
|||||||
inputs.zen-browser.packages.${pkgs.stdenv.hostPlatform.system}.default
|
inputs.zen-browser.packages.${pkgs.stdenv.hostPlatform.system}.default
|
||||||
];
|
];
|
||||||
|
|
||||||
|
fonts = {
|
||||||
|
enableDefaultPackages = true;
|
||||||
|
packages = with pkgs; [
|
||||||
|
jetbrains-mono
|
||||||
|
];
|
||||||
|
fontDir.enable = true;
|
||||||
|
};
|
||||||
|
|
||||||
programs.hyprland = {
|
programs.hyprland = {
|
||||||
enable = true;
|
enable = true;
|
||||||
xwayland.enable = true;
|
xwayland.enable = true;
|
||||||
};
|
};
|
||||||
programs.zsh.enable = true;
|
programs.zsh.enable = true;
|
||||||
|
|
||||||
|
programs.steam = {
|
||||||
|
enable = true;
|
||||||
|
extraCompatPackages = [
|
||||||
|
pkgs.proton-ge-bin
|
||||||
|
];
|
||||||
|
protontricks = {
|
||||||
|
enable = true;
|
||||||
|
};
|
||||||
|
};
|
||||||
|
|
||||||
# Some programs need SUID wrappers, can be configured further or are
|
# Some programs need SUID wrappers, can be configured further or are
|
||||||
# started in user sessions.
|
# started in user sessions.
|
||||||
@@ -113,10 +130,9 @@
|
|||||||
#TODO: kanata config
|
#TODO: kanata config
|
||||||
};
|
};
|
||||||
|
|
||||||
services.tailscale = {
|
services.mullvad-vpn.enable = true;
|
||||||
enable = true;
|
|
||||||
openFirewall = true;
|
networking.firewall.enable = false;
|
||||||
};
|
|
||||||
|
|
||||||
# Enable the OpenSSH daemon.
|
# Enable the OpenSSH daemon.
|
||||||
# services.openssh.enable = true;
|
# services.openssh.enable = true;
|
||||||
|
|||||||
22
flake.lock
generated
22
flake.lock
generated
@@ -1,5 +1,26 @@
|
|||||||
{
|
{
|
||||||
"nodes": {
|
"nodes": {
|
||||||
|
"catppuccin": {
|
||||||
|
"inputs": {
|
||||||
|
"nixpkgs": [
|
||||||
|
"nixpkgs"
|
||||||
|
]
|
||||||
|
},
|
||||||
|
"locked": {
|
||||||
|
"lastModified": 1768256610,
|
||||||
|
"narHash": "sha256-IyL6nZo242nDLoLQVwkqAZXp8FO5kBfjL6Fuh+gZO10=",
|
||||||
|
"owner": "catppuccin",
|
||||||
|
"repo": "nix",
|
||||||
|
"rev": "0734ad8c91342df34f1a1e5c183d053d70ba87c7",
|
||||||
|
"type": "github"
|
||||||
|
},
|
||||||
|
"original": {
|
||||||
|
"owner": "catppuccin",
|
||||||
|
"ref": "release-25.11",
|
||||||
|
"repo": "nix",
|
||||||
|
"type": "github"
|
||||||
|
}
|
||||||
|
},
|
||||||
"flake-parts": {
|
"flake-parts": {
|
||||||
"inputs": {
|
"inputs": {
|
||||||
"nixpkgs-lib": [
|
"nixpkgs-lib": [
|
||||||
@@ -153,6 +174,7 @@
|
|||||||
},
|
},
|
||||||
"root": {
|
"root": {
|
||||||
"inputs": {
|
"inputs": {
|
||||||
|
"catppuccin": "catppuccin",
|
||||||
"home-manager": "home-manager",
|
"home-manager": "home-manager",
|
||||||
"nixpkgs": "nixpkgs",
|
"nixpkgs": "nixpkgs",
|
||||||
"nixvim": "nixvim",
|
"nixvim": "nixvim",
|
||||||
|
|||||||
@@ -11,6 +11,8 @@
|
|||||||
url = "github:youwen5/zen-browser-flake";
|
url = "github:youwen5/zen-browser-flake";
|
||||||
inputs.nixpkgs.follows = "nixpkgs";
|
inputs.nixpkgs.follows = "nixpkgs";
|
||||||
};
|
};
|
||||||
|
catppuccin.url = "github:catppuccin/nix/release-25.11";
|
||||||
|
catppuccin.inputs.nixpkgs.follows = "nixpkgs";
|
||||||
};
|
};
|
||||||
|
|
||||||
outputs = { self, nixpkgs, home-manager, nixvim, ... }@inputs: {
|
outputs = { self, nixpkgs, home-manager, nixvim, ... }@inputs: {
|
||||||
|
|||||||
@@ -34,4 +34,27 @@
|
|||||||
|
|
||||||
hardware.graphics.enable = true;
|
hardware.graphics.enable = true;
|
||||||
hardware.graphics.extraPackages = [ pkgs.rocmPackages.clr.icd ];
|
hardware.graphics.extraPackages = [ pkgs.rocmPackages.clr.icd ];
|
||||||
|
|
||||||
|
networking.networkmanager = {
|
||||||
|
enable = true;
|
||||||
|
ensureProfiles.profiles = {
|
||||||
|
p2p-nas = {
|
||||||
|
connection = {
|
||||||
|
id="p2p-nas";
|
||||||
|
type = "ethernet";
|
||||||
|
interface-name = "enp1s0";
|
||||||
|
autoconnect = true;
|
||||||
|
};
|
||||||
|
ipv6 = {
|
||||||
|
method = "manual";
|
||||||
|
addresses = "fd00:fa57::1/64";
|
||||||
|
};
|
||||||
|
ipv4.method = "disabled";
|
||||||
|
ethernet.mtu = 9000;
|
||||||
|
};
|
||||||
|
};
|
||||||
|
};
|
||||||
|
networking.extraHosts = ''
|
||||||
|
fd00:fa57::2 duke.veltnet
|
||||||
|
'';
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -1,6 +1,7 @@
|
|||||||
{ config, pkgs, username, inputs, ...}: {
|
{ config, pkgs, username, inputs, ...}: {
|
||||||
imports = [
|
imports = [
|
||||||
inputs.nixvim.homeModules.nixvim
|
inputs.nixvim.homeModules.nixvim
|
||||||
|
inputs.catppuccin.homeModules.catppuccin
|
||||||
];
|
];
|
||||||
|
|
||||||
#NOTE: MUST be kept up to date with nixpkgs!
|
#NOTE: MUST be kept up to date with nixpkgs!
|
||||||
@@ -12,15 +13,24 @@
|
|||||||
home.packages = with pkgs; [
|
home.packages = with pkgs; [
|
||||||
mpv
|
mpv
|
||||||
bitwarden-desktop
|
bitwarden-desktop
|
||||||
|
feh
|
||||||
|
grim
|
||||||
|
slurp
|
||||||
|
xdg-user-dirs
|
||||||
|
libqalculate
|
||||||
];
|
];
|
||||||
|
|
||||||
programs.wofi.enable = true;
|
programs.wofi.enable = true;
|
||||||
|
|
||||||
|
catppuccin.enable = true;
|
||||||
|
|
||||||
wayland.windowManager.hyprland = {
|
wayland.windowManager.hyprland = {
|
||||||
enable = true;
|
enable = true;
|
||||||
settings = import ./hyprland/settings.nix;
|
settings = import ./hyprland/settings.nix;
|
||||||
};
|
};
|
||||||
|
|
||||||
|
#TODO: decide on waybar
|
||||||
|
|
||||||
programs.nixvim = {
|
programs.nixvim = {
|
||||||
enable = true;
|
enable = true;
|
||||||
|
|
||||||
@@ -71,7 +81,7 @@
|
|||||||
# For automatic login
|
# For automatic login
|
||||||
profileExtra = ''
|
profileExtra = ''
|
||||||
if [ -z "$WAYLAND_DISPLAY" ] && [ "$XDG_VTNR" = 1 ]; then
|
if [ -z "$WAYLAND_DISPLAY" ] && [ "$XDG_VTNR" = 1 ]; then
|
||||||
exec hyprland
|
exec hyprland > /var/log/hypr.log
|
||||||
fi
|
fi
|
||||||
'';
|
'';
|
||||||
|
|
||||||
|
|||||||
@@ -1,10 +1,14 @@
|
|||||||
{
|
{
|
||||||
"$mod" = "SUPER";
|
"$mod" = "SUPER";
|
||||||
|
"$browser" = "zen";
|
||||||
|
"$term" = "kitty";
|
||||||
|
|
||||||
general = {
|
general = {
|
||||||
border_size = 0;
|
border_size = 2;
|
||||||
gaps_in = 5;
|
gaps_in = 5;
|
||||||
gaps_out = 10;
|
gaps_out = 10;
|
||||||
layout = "dwindle";
|
layout = "dwindle";
|
||||||
|
allow_tearing = false;
|
||||||
resize_on_border = true;
|
resize_on_border = true;
|
||||||
};
|
};
|
||||||
|
|
||||||
@@ -14,20 +18,35 @@
|
|||||||
|
|
||||||
input = {
|
input = {
|
||||||
kb_layout = "de";
|
kb_layout = "de";
|
||||||
|
follow_mouse = 1;
|
||||||
};
|
};
|
||||||
|
|
||||||
bind = builtins.concatLists [
|
bind = [
|
||||||
[
|
|
||||||
"$mod, Q, exit"
|
"$mod, Q, exit"
|
||||||
"$mod, Return, exec, kitty"
|
"$mod, Return, exec, $term"
|
||||||
"$mod, D, exec, wofi --show drun"
|
"$mod, D, exec, wofi --show drun"
|
||||||
"$mod, F2, exec, zen"
|
"$mod, F2, exec, $browser"
|
||||||
"$mod, c, killactive"
|
"$mod, c, killactive"
|
||||||
"$mod, f, fullscreen"
|
"$mod, f, fullscreen"
|
||||||
|
"$mod, h, movefocus, l"
|
||||||
|
"$mod, j, movefocus, d"
|
||||||
|
"$mod, k, movefocus, u"
|
||||||
|
"$mod, l, movefocus, r"
|
||||||
|
"$mod+SHIFT, h, movewindow, l"
|
||||||
|
"$mod+SHIFT, j, movewindow, d"
|
||||||
|
"$mod+SHIFT, k, movewindow, u"
|
||||||
|
"$mod+SHIFT, l, movewindow, r"
|
||||||
|
", Print, exec, grim -g \"$(slurp)\" \"/home/weckyy702/Pictures/screenshots/$(date -Iseconds).png\""
|
||||||
|
"$mod+SHIFT, s, exec, hyprlock"
|
||||||
]
|
]
|
||||||
|
++
|
||||||
# Switch workspaces
|
# Switch workspaces
|
||||||
(map (i: "$mod, ${builtins.toString i}, workspace, ${builtins.toString i}") [1 2 3 4 5 6 7 8 9])
|
(map (i: "$mod, ${builtins.toString i}, workspace, ${builtins.toString i}") [1 2 3 4 5 6 7 8 9])
|
||||||
(map (i: "$mod+SHIFT, ${builtins.toString i}, movetoworkspace, ${builtins.toString i}") [1 2 3 4 5 6 7 8 9])
|
++
|
||||||
|
(map (i: "$mod+SHIFT, ${builtins.toString i}, movetoworkspacesilent, ${builtins.toString i}") [1 2 3 4 5 6 7 8 9]);
|
||||||
|
|
||||||
|
bindm = [
|
||||||
|
"$mod, mouse:272, movewindow"
|
||||||
];
|
];
|
||||||
|
|
||||||
decoration = {
|
decoration = {
|
||||||
|
|||||||
Reference in New Issue
Block a user