kopatz/nix-config
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'master' of github.com:Kropatz/dotfiles

Browse Source
This commit is contained in:
Kopatz
2023-12-19 10:40:35 +01:00
parent 1f4035ff0c 2abad4ce3b
commit 4b71128bd9
22 changed files with 105 additions and 396 deletions
Download Patch File Download Diff File Expand all files Collapse all files

0
laptop/.config/rofi/config.rasi → .config/rofi/config.rasi
View File

0
laptop/.config/rofi/nord.rasi → .config/rofi/nord.rasi
View File

69
laptop/.ideavimrc → .ideavimrc
View File

@@ -1,35 +1,34 @@
""" https://towardsdatascience.com/the-essential-ideavim-remaps-291d4cd3971b?gi=952bee140daf
set relativenumber
set number
set clipboard=unnamedplus
vnoremap p "_dp
vnoremap P "_dP
set ignorecase
set smartcase
set incsearch
set scrolloff=8
let mapleader=" "
"plugins
set quickscope
set which-key
set notimeout
set easymotion
set surround
nnoremap <leader>, :action IdeaVim.ReloadVimRc.reload<CR>
nnoremap <SPACE> <Nop>
nnoremap <leader>t :action Terminal.OpenInTerminal<CR>
nnoremap <leader>q :action QuickJavaDoc<CR>
nnoremap <leader>f :action Find<CR>
nnoremap <leader>r :action Replace<CR>
nnoremap J mzJ`z
nnoremap S ht lr<cr>k$
vnoremap J :m '>+1<CR>gv=gv
vnoremap K :m '<-2<CR>gv=gv
map <leader>l V<Action>(ReformatCode)
set relativenumber
set number
set clipboard=unnamedplus
vnoremap p "_dp
vnoremap P "_dP
set ignorecase
set smartcase
set incsearch
set scrolloff=8
let mapleader=" "
"plugins
set quickscope
set which-key
set notimeout
set easymotion
set surround
nnoremap <leader>, :action IdeaVim.ReloadVimRc.reload<CR>
nnoremap <SPACE> <Nop>
nnoremap <leader>t :action Terminal.OpenInTerminal<CR>
nnoremap <leader>q :action QuickJavaDoc<CR>
nnoremap <leader>f :action Find<CR>
nnoremap <leader>r :action Replace<CR>
nnoremap J mzJ`z
nnoremap S ht lr<cr>k$
vnoremap J :m '>+1<CR>gv=gv
vnoremap K :m '<-2<CR>gv=gv
map <leader>l V<Action>(ReformatCode)

145
flake.lock generated
View File

@@ -76,7 +76,7 @@
},
"flake-utils": {
"inputs": {
"systems": "systems_2"
"systems": "systems"
},
"locked": {
"lastModified": 1701680307,
@@ -120,11 +120,11 @@
]
},
"locked": {
"lastModified": 1702195709,
"narHash": "sha256-+zRjWkm5rKqQ57PuLZ3JF3xi3vPMiOJzItb1m/43Cq4=",
"lastModified": 1702814678,
"narHash": "sha256-zDtO0jV2QLoddUJinLlTQrQqCUW3dPiIWOSYgg98T7E=",
"owner": "nix-community",
"repo": "home-manager",
"rev": "6761b8188b860f374b457eddfdb05c82eef9752f",
"rev": "1488651d02c1a7a15e284210f0d380a62d8d8cef",
"type": "github"
},
"original": {
@@ -134,55 +134,6 @@
"type": "github"
}
},
"hyprland": {
"inputs": {
"hyprland-protocols": "hyprland-protocols",
"nixpkgs": [
"nixpkgs-unstable"
],
"systems": "systems",
"wlroots": "wlroots",
"xdph": "xdph"
},
"locked": {
"lastModified": 1702488319,
"narHash": "sha256-goxBCjjWitvx2Oq4AihpA2OhYEirolMLC48fdA7Iey8=",
"owner": "hyprwm",
"repo": "Hyprland",
"rev": "01e5c59d752d3fe7fa484330fa48e010054b8fa1",
"type": "github"
},
"original": {
"owner": "hyprwm",
"repo": "Hyprland",
"type": "github"
}
},
"hyprland-protocols": {
"inputs": {
"nixpkgs": [
"hyprland",
"nixpkgs"
],
"systems": [
"hyprland",
"systems"
]
},
"locked": {
"lastModified": 1691753796,
"narHash": "sha256-zOEwiWoXk3j3+EoF3ySUJmberFewWlagvewDRuWYAso=",
"owner": "hyprwm",
"repo": "hyprland-protocols",
"rev": "0c2ce70625cb30aef199cb388f99e19a61a6ce03",
"type": "github"
},
"original": {
"owner": "hyprwm",
"repo": "hyprland-protocols",
"type": "github"
}
},
"nix-colors": {
"inputs": {
"base16-schemes": "base16-schemes",
@@ -222,11 +173,11 @@
},
"nixos-hardware": {
"locked": {
"lastModified": 1702245580,
"narHash": "sha256-tTVRB42Ljo2uWGP7ei5h5/qQjOsdXoz0GHRy9hrVrdw=",
"lastModified": 1702453208,
"narHash": "sha256-0wRi9SposfE2wHqjuKt8WO2izKB/ASDOV91URunIqgo=",
"owner": "NixOS",
"repo": "nixos-hardware",
"rev": "030edbb68e69f2b97231479f98a9597024650df2",
"rev": "7763c6fd1f299cb9361ff2abf755ed9619ef01d6",
"type": "github"
},
"original": {
@@ -245,11 +196,11 @@
]
},
"locked": {
"lastModified": 1702287306,
"narHash": "sha256-vEb2DAao89M92LjufnRkIRxUsm8KHb94l786r923a7E=",
"lastModified": 1702867085,
"narHash": "sha256-zcKtsexiTURppa7styWbMvrFiIYfoY5mBtWeIlh7YqU=",
"owner": "nix-community",
"repo": "NixOS-WSL",
"rev": "83c419a8c5db581e83cba3726760608e55d11e58",
"rev": "86f3b26038b36603f51e260979a09e9c659415e9",
"type": "github"
},
"original": {
@@ -291,11 +242,11 @@
},
"nixpkgs-unstable": {
"locked": {
"lastModified": 1702151865,
"narHash": "sha256-9VAt19t6yQa7pHZLDbil/QctAgVsA66DLnzdRGqDisg=",
"lastModified": 1702312524,
"narHash": "sha256-gkZJRDBUCpTPBvQk25G0B7vfbpEYM5s5OZqghkjZsnE=",
"owner": "NixOS",
"repo": "nixpkgs",
"rev": "666fc80e7b2afb570462423cb0e1cf1a3a34fedd",
"rev": "a9bf124c46ef298113270b1f84a164865987a91c",
"type": "github"
},
"original": {
@@ -322,11 +273,11 @@
},
"nixpkgs_3": {
"locked": {
"lastModified": 1701952659,
"narHash": "sha256-TJv2srXt6fYPUjxgLAL0cy4nuf1OZD4KuA1TrCiQqg0=",
"lastModified": 1702780907,
"narHash": "sha256-blbrBBXjjZt6OKTcYX1jpe9SRof2P9ZYWPzq22tzXAA=",
"owner": "nixos",
"repo": "nixpkgs",
"rev": "b4372c4924d9182034066c823df76d6eaf1f4ec4",
"rev": "1e2e384c5b7c50dbf8e9c441a9e58d85f408b01f",
"type": "github"
},
"original": {
@@ -340,7 +291,6 @@
"inputs": {
"agenix": "agenix",
"home-manager": "home-manager_2",
"hyprland": "hyprland",
"nix-colors": "nix-colors",
"nixinate": "nixinate",
"nixos-hardware": "nixos-hardware",
@@ -350,21 +300,6 @@
}
},
"systems": {
"locked": {
"lastModified": 1689347949,
"narHash": "sha256-12tWmuL2zgBgZkdoB6qXZsgJEH9LR3oUgpaQq2RbI80=",
"owner": "nix-systems",
"repo": "default-linux",
"rev": "31732fcf5e8fea42e59c2488ad31a0e651500f68",
"type": "github"
},
"original": {
"owner": "nix-systems",
"repo": "default-linux",
"type": "github"
}
},
"systems_2": {
"locked": {
"lastModified": 1681028828,
"narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=",
@@ -378,54 +313,6 @@
"repo": "default",
"type": "github"
}
},
"wlroots": {
"flake": false,
"locked": {
"host": "gitlab.freedesktop.org",
"lastModified": 1701368958,
"narHash": "sha256-7kvyoA91etzVEl9mkA/EJfB6z/PltxX7Xc4gcr7/xlo=",
"owner": "wlroots",
"repo": "wlroots",
"rev": "5d639394f3e83b01596dcd166a44a9a1a2583350",
"type": "gitlab"
},
"original": {
"host": "gitlab.freedesktop.org",
"owner": "wlroots",
"repo": "wlroots",
"rev": "5d639394f3e83b01596dcd166a44a9a1a2583350",
"type": "gitlab"
}
},
"xdph": {
"inputs": {
"hyprland-protocols": [
"hyprland",
"hyprland-protocols"
],
"nixpkgs": [
"hyprland",
"nixpkgs"
],
"systems": [
"hyprland",
"systems"
]
},
"locked": {
"lastModified": 1702334919,
"narHash": "sha256-ibOZ3TLjqndGMcj2f+07NFwDWoum4IbzF58byZuJJNg=",
"owner": "hyprwm",
"repo": "xdg-desktop-portal-hyprland",
"rev": "f5c3576c3b6cb1c31a8dfa3e4113f59bfe40cd71",
"type": "github"
},
"original": {
"owner": "hyprwm",
"repo": "xdg-desktop-portal-hyprland",
"type": "github"
}
}
},
"root": "root",

39
flake.nix
View File

@@ -16,10 +16,6 @@
};
nixinate.url = "github:matthewcroughan/nixinate";
nix-colors.url = "github:misterio77/nix-colors";
hyprland = {
url = "github:hyprwm/Hyprland";
inputs.nixpkgs.follows = "nixpkgs-unstable"; # MESA/OpenGL HW workaround
};
};
outputs = { self,
nixpkgs,
@@ -30,7 +26,6 @@
home-manager,
nixinate,
nix-colors,
hyprland,
}@inputs:
let
system = "x86_64-linux";
@@ -110,7 +105,6 @@
./users/kopatz
### System modules ###
./modules/graphical/plasma.nix
hyprland.nixosModules.default
./modules/graphical/hyprland.nix
./modules/graphical/emulators.nix
./modules/graphical/gamemode.nix
@@ -151,11 +145,9 @@
### User specific ###
./users/kopatz
({ config, pkgs, ... }: { nixpkgs.overlays = [ overlay-unstable ]; })
# Todo: refactor file layout
hyprland.nixosModules.default
./modules/graphical/hyprland.nix
./modules/graphical/shared.nix
./laptop/configuration.nix
./systems/laptop/configuration.nix
./modules/cli-tools.nix
./modules/virt-manager.nix
./modules/vmware-host.nix
@@ -173,39 +165,12 @@
home-manager.nixosModules.home-manager
];
};
nixosConfigurations."nix-laptop-no-gpu" = nixpkgs.lib.nixosSystem {
inherit system;
specialArgs = {
## Custom variables (e.g. ip, interface, etc)
vars = (import ./systems/laptop/userdata.nix);
inherit inputs ;
};
modules = [
### User specific ###
./users/option.nix
./users/kopatz.nix
({ config, pkgs, ... }: { nixpkgs.overlays = [ overlay-unstable ]; })
./laptop/configuration.nix
./modules/graphical/shared.nix
./modules/cli-tools.nix
./modules/virt-manager.nix
./modules/ssh.nix
./modules/wake-on-lan.nix
./modules/static-ip.nix
./modules/no-sleep-lid-closed.nix
./modules/thunderbolt.nix
./modules/nix/settings.nix
nixos-hardware.nixosModules.dell-xps-15-7590
agenix.nixosModules.default
home-manager.nixosModules.home-manager
];
};
nixosConfigurations."wsl" = nixpkgs.lib.nixosSystem {
inherit system;
specialArgs = {inherit inputs ;};
modules = [
#"${nixpkgs}/nixos/modules/profiles/minimal.nix"
./users/anon.nix
./users/anon
({ config, pkgs, ... }: { nixpkgs.overlays = [ overlay-unstable ]; })
./systems/wsl/configuration.nix
nixos-wsl.nixosModules.wsl

5
home-manager/hyprland-settings.nix
View File

@@ -133,7 +133,7 @@
# Example binds, see https://wiki.hyprland.org/Configuring/Binds/ for more
bind = let
rofi = "${pkgs.rofi-wayland}/bin/rofi";
konsole = "${pkgs.konsole}/bin/konsole";
kitty = "${pkgs.kitty}/bin/kitty";
thunar = "${pkgs.xfce.thunar}/bin/thunar";
wl-copy = "${pkgs.wl-clipboard}/bin/wl-copy";
wl-paste = "${pkgs.wl-clipboard}/bin/wl-paste";
@@ -145,11 +145,12 @@
swaylock = "${pkgs.swaylock}/bin/swaylock";
playerctl = "${pkgs.playerctl}/bin/playerctl";
in [
"$mainMod, Q, exec, ${konsole}"
"$mainMod, Q, exec, ${kitty}"
"$mainMod, C, killactive"
"$mainMod, L, exec, ${swaylock} -f -c 000000"
"$mainMod, M, exit,"
"$mainMod, E, exec, ${thunar}"
"$mainMod, F, fullscreen"
"$mainMod, V, togglefloating"
"$mainMod, I, exec, ${rofi} -show drun -show-icons"
"$mainMod, S, exec, cat ~/songs | shuf -n 1 | sed \"s/^/b\.p /g\" | ${wl-copy}"

22
home-manager/kitty.nix Normal file
View File

@@ -0,0 +1,22 @@
{ config, pkgs, inputs, ...}:
{
programs.kitty = {
enable = true;
settings = {
foreground = "#${config.colorScheme.colors.base05}";
background = "#${config.colorScheme.colors.base00}";
active_tab_foreground = "#${config.colorScheme.colors.base05}";
active_tab_background = "#${config.colorScheme.colors.base01}";
inactive_tab_foreground = "#${config.colorScheme.colors.base05}";
inactive_tab_background = "#${config.colorScheme.colors.base00}";
env = "TERM=xterm-256color";
background_opacity = "0.5";
font_size = 13;
# ...
};
extraConfig = ''
map ctrl+shift+t new_tab_with_cwd
'';
};
}

23
home-manager/themes/yorha/colors.nix Normal file
View File

@@ -0,0 +1,23 @@
{
slug = "yorha";
name = "yorha";
author = "flick0 (https://github.com/flick0)";
colors = {
base00 = "#1e1d1c";
base01 = "#A39D8F";
base02 = "#AFA899";
base03 = "#BBB4A5";
base04 = "#C3BCAB";
base05 = "#D2CCB9";
base06 = "#DBD5C2";
base07 = "#e8e5da";
base08 = "#a2a098";
base09 = "#A39D8F";
base10 = "#AFA899";
base11 = "#BBB4A5";
base12 = "#C3BCAB";
base13 = "#D2CCB9";
base14 = "#DBD5C2";
base15 = "#e8e5da";
};
}

173
laptop/.config/hypr/hyprland.conf
View File

@@ -1,173 +0,0 @@
########################################################################################
AUTOGENERATED HYPR CONFIG.
PLEASE USE THE CONFIG PROVIDED IN THE GIT REPO /examples/hypr.conf AND EDIT IT,
OR EDIT THIS ONE ACCORDING TO THE WIKI INSTRUCTIONS.
########################################################################################
#
# Please note not all available settings / options are set here.
# For a full list, see the wiki
#
# See https://wiki.hyprland.org/Configuring/Monitors/
monitor=,preferred,auto,auto
# See https://wiki.hyprland.org/Configuring/Keywords/ for more
# Execute your favorite apps at launch
# exec-once = waybar & hyprpaper & firefox
# Source a file (multi-file configs)
# source = ~/.config/hypr/myColors.conf
# Some default env vars.
env = XCURSOR_SIZE,24
# For all categories, see https://wiki.hyprland.org/Configuring/Variables/
input {
kb_layout = de
kb_variant =
kb_model =
kb_options =
kb_rules =
follow_mouse = 1
touchpad {
natural_scroll = yes
}
sensitivity = 0 # -1.0 - 1.0, 0 means no modification.
}
general {
# See https://wiki.hyprland.org/Configuring/Variables/ for more
gaps_in = 5
gaps_out = 20
border_size = 2
col.active_border = rgba(33ccffee) rgba(00ff99ee) 45deg
col.inactive_border = rgba(595959aa)
layout = dwindle
}
decoration {
# See https://wiki.hyprland.org/Configuring/Variables/ for more
rounding = 10
blur = yes
blur_size = 3
blur_passes = 1
blur_new_optimizations = on
drop_shadow = yes
shadow_range = 4
shadow_render_power = 3
col.shadow = rgba(1a1a1aee)
}
animations {
enabled = no
# Some default animations, see https://wiki.hyprland.org/Configuring/Animations/ for more
bezier = myBezier, 0.05, 0.9, 0.1, 1.05
animation = windows, 1, 7, myBezier
animation = windowsOut, 1, 7, default, popin 80%
animation = border, 1, 10, default
animation = borderangle, 1, 8, default
animation = fade, 1, 7, default
animation = workspaces, 1, 6, default
}
dwindle {
# See https://wiki.hyprland.org/Configuring/Dwindle-Layout/ for more
pseudotile = yes # master switch for pseudotiling. Enabling is bound to mainMod + P in the keybinds section below
preserve_split = yes # you probably want this
}
master {
# See https://wiki.hyprland.org/Configuring/Master-Layout/ for more
new_is_master = true
}
gestures {
# See https://wiki.hyprland.org/Configuring/Variables/ for more
workspace_swipe = on
}
# Example per-device config
# See https://wiki.hyprland.org/Configuring/Keywords/#executing for more
device:epic-mouse-v1 {
sensitivity = -0.5
}
# Example windowrule v1
# windowrule = float, ^(kitty)$
# Example windowrule v2
# windowrulev2 = float,class:^(kitty)$,title:^(kitty)$
# See https://wiki.hyprland.org/Configuring/Window-Rules/ for more
# See https://wiki.hyprland.org/Configuring/Keywords/ for more
$mainMod = SUPER
# Example binds, see https://wiki.hyprland.org/Configuring/Binds/ for more
bind = $mainMod, Q, exec, kitty
bind = $mainMod, C, killactive,
bind = $mainMod, M, exit,
bind = $mainMod, E, exec, dolphin
bind = $mainMod, V, togglefloating,
bind = $mainMod, R, exec, wofi --show drun
bind = $mainMod, S, exec, rofi -show drun -show-icons
bind = ALT, SPACE, exec, rofi -show combi
bind = $mainMod, P, pseudo, # dwindle
bind = $mainMod, J, togglesplit, # dwindle
# Move focus with mainMod + arrow keys
bind = $mainMod, left, movefocus, l
bind = $mainMod, right, movefocus, r
bind = $mainMod, up, movefocus, u
bind = $mainMod, down, movefocus, d
# Switch workspaces with mainMod + [0-9]
bind = $mainMod, 1, workspace, 1
bind = $mainMod, 2, workspace, 2
bind = $mainMod, 3, workspace, 3
bind = $mainMod, 4, workspace, 4
bind = $mainMod, 5, workspace, 5
bind = $mainMod, 6, workspace, 6
bind = $mainMod, 7, workspace, 7
bind = $mainMod, 8, workspace, 8
bind = $mainMod, 9, workspace, 9
bind = $mainMod, 0, workspace, 10
# Move active window to a workspace with mainMod + SHIFT + [0-9]
bind = $mainMod SHIFT, 1, movetoworkspace, 1
bind = $mainMod SHIFT, 2, movetoworkspace, 2
bind = $mainMod SHIFT, 3, movetoworkspace, 3
bind = $mainMod SHIFT, 4, movetoworkspace, 4
bind = $mainMod SHIFT, 5, movetoworkspace, 5
bind = $mainMod SHIFT, 6, movetoworkspace, 6
bind = $mainMod SHIFT, 7, movetoworkspace, 7
bind = $mainMod SHIFT, 8, movetoworkspace, 8
bind = $mainMod SHIFT, 9, movetoworkspace, 9
bind = $mainMod SHIFT, 0, movetoworkspace, 10
# Scroll through existing workspaces with mainMod + scroll
bind = $mainMod, mouse_down, workspace, e+1
bind = $mainMod, mouse_up, workspace, e-1
# Move/resize windows with mainMod + LMB/RMB and dragging
bindm = $mainMod, mouse:272, movewindow
bindm = $mainMod, mouse:273, resizewindow
bind = ALT, Tab, cyclenext,
bind = ALT, Tab, bringactivetotop,
exec-once= bash ~/.config/hypr/start.sh

10
laptop/.config/hypr/start.sh
View File

@@ -1,10 +0,0 @@
#!/usr/bin/env bash
# wallpaper daemon
swww init &
nm-applet --indicator &
waybar &
dunst &

2
modules/graphical/shared.nix
View File

@@ -17,6 +17,7 @@ in
fonts.fontDir.enable = true;
fonts.packages = with pkgs; [
uw-ttyp0
corefonts
nerdfonts
noto-fonts
@@ -67,6 +68,7 @@ in
brightnessctl
wacomtablet
osu-lazer-bin
libsForQt5.kolourpaint
];
#environment.sessionVariables = {

2
modules/hardware/nvidia.nix
View File

@@ -23,7 +23,7 @@
# https://github.com/NVIDIA/open-gpu-kernel-modules#compatible-gpus
# Only available from driver 515.43.04+
# Currently alpha-quality/buggy, so false is currently the recommended setting.
open = true;
open = false;
# Enable the Nvidia settings menu,
# accessible via `nvidia-settings`.
nvidiaSettings = true;

0
laptop/configuration.nix → systems/laptop/configuration.nix
View File

0
laptop/gnome.nix → systems/laptop/gnome.nix
View File

0
laptop/hardware-configuration.nix → systems/laptop/hardware-configuration.nix
View File

0
laptop/main.nix → systems/laptop/main.nix
View File

0
laptop/modules/battery.nix → systems/laptop/modules/battery.nix
View File

0
laptop/modules/wireguard.nix → systems/laptop/modules/wireguard.nix
View File

0
laptop/plasma.nix → systems/laptop/plasma.nix
View File

0
laptop/secrets/secrets.nix → systems/laptop/secrets/secrets.nix
View File

0
laptop/secrets/wireguard-private.age → systems/laptop/secrets/wireguard-private.age
View File

11
users/kopatz/home.nix
View File

@@ -11,14 +11,6 @@
# changes in each release.
stateVersion = "23.05";
};
programs.kitty = {
enable = true;
settings = {
foreground = "#${config.colorScheme.colors.base05}";
background = "#${config.colorScheme.colors.base00}";
# ...
};
};
imports = [
../../home-manager/nvim.nix
@@ -27,8 +19,9 @@
../../home-manager/gtk-theme.nix
../../home-manager/direnv.nix
../../home-manager/lf.nix
../../home-manager/kitty.nix
inputs.nix-colors.homeManagerModule
];
colorScheme = inputs.nix-colors.colorSchemes.tokyo-night-dark;
colorScheme = import ../../home-manager/themes/yorha/colors.nix;
}