From 8faf7664b89cd548b1f6abfce4374a493bde7aea Mon Sep 17 00:00:00 2001
From: Kopatz <7265381+Kropatz@users.noreply.github.com>
Date: Sun, 17 Dec 2023 17:47:45 +0100
Subject: [PATCH] move laptop files
---
flake.nix | 32 +---
home-manager/kitty.nix | 10 +-
laptop/.config/hypr/hyprland.conf | 173 ------------------
laptop/.config/hypr/start.sh | 10 -
laptop/.config/rofi/config.rasi | 156 ----------------
laptop/.config/rofi/nord.rasi | 105 -----------
laptop/.ideavimrc | 35 ----
{laptop => systems/laptop}/configuration.nix | 0
{laptop => systems/laptop}/gnome.nix | 0
.../laptop}/hardware-configuration.nix | 0
{laptop => systems/laptop}/main.nix | 0
.../laptop}/modules/battery.nix | 0
.../laptop}/modules/wireguard.nix | 0
{laptop => systems/laptop}/plasma.nix | 0
.../laptop}/secrets/secrets.nix | 0
.../laptop}/secrets/wireguard-private.age | 0
16 files changed, 8 insertions(+), 513 deletions(-)
delete mode 100644 laptop/.config/hypr/hyprland.conf
delete mode 100755 laptop/.config/hypr/start.sh
delete mode 100644 laptop/.config/rofi/config.rasi
delete mode 100644 laptop/.config/rofi/nord.rasi
delete mode 100644 laptop/.ideavimrc
rename {laptop => systems/laptop}/configuration.nix (100%)
rename {laptop => systems/laptop}/gnome.nix (100%)
rename {laptop => systems/laptop}/hardware-configuration.nix (100%)
rename {laptop => systems/laptop}/main.nix (100%)
rename {laptop => systems/laptop}/modules/battery.nix (100%)
rename {laptop => systems/laptop}/modules/wireguard.nix (100%)
rename {laptop => systems/laptop}/plasma.nix (100%)
rename {laptop => systems/laptop}/secrets/secrets.nix (100%)
rename {laptop => systems/laptop}/secrets/wireguard-private.age (100%)
diff --git a/flake.nix b/flake.nix
index 1906157..b890376 100644
--- a/flake.nix
+++ b/flake.nix
@@ -151,11 +151,10 @@
### 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 +172,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
diff --git a/home-manager/kitty.nix b/home-manager/kitty.nix
index e482524..1206266 100644
--- a/home-manager/kitty.nix
+++ b/home-manager/kitty.nix
@@ -5,16 +5,18 @@
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+left neighboring_window left
- map shift+left move_window right
- map ctrl+down neighboring_window down
- map shift+down move_window up
+ map ctrl+shift+t new_tab_with_cwd
'';
};
}
diff --git a/laptop/.config/hypr/hyprland.conf b/laptop/.config/hypr/hyprland.conf
deleted file mode 100644
index 1d23fe6..0000000
--- a/laptop/.config/hypr/hyprland.conf
+++ /dev/null
@@ -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
diff --git a/laptop/.config/hypr/start.sh b/laptop/.config/hypr/start.sh
deleted file mode 100755
index 6e19fbe..0000000
--- a/laptop/.config/hypr/start.sh
+++ /dev/null
@@ -1,10 +0,0 @@
-#!/usr/bin/env bash
-
-# wallpaper daemon
-swww init &
-
-nm-applet --indicator &
-
-waybar &
-
-dunst &
diff --git a/laptop/.config/rofi/config.rasi b/laptop/.config/rofi/config.rasi
deleted file mode 100644
index b528f72..0000000
--- a/laptop/.config/rofi/config.rasi
+++ /dev/null
@@ -1,156 +0,0 @@
-configuration {
- modes: [ combi, window, drun ];
- combi-modes: [ window, drun ];
- combi-display-format: "{text}";
- //modes: "window,drun,run,ssh";
- font: "mono 20";
-/* location: 0;*/
-/* yoffset: 0;*/
-/* xoffset: 0;*/
-/* fixed-num-lines: true;*/
- show-icons: true;
-/* terminal: "rofi-sensible-terminal";*/
-/* ssh-client: "ssh";*/
-/* ssh-command: "{terminal} -e {ssh-client} {host} [-p {port}]";*/
-/* run-command: "{cmd}";*/
-/* run-list-command: "";*/
-/* run-shell-command: "{terminal} -e {cmd}";*/
- window-command: "wmctrl -i -R {window}";
- window-match-fields: "all";
-/* icon-theme: ;*/
-/* drun-match-fields: "name,generic,exec,categories,keywords";*/
-/* drun-categories: ;*/
-/* drun-show-actions: false;*/
-/* drun-display-format: "{name} [({generic})]";*/
-/* drun-url-launcher: "xdg-open";*/
-/* disable-history: false;*/
-/* ignored-prefixes: "";*/
- sort: true;
-/* sorting-method: "normal";*/
-/* case-sensitive: false;*/
-/* cycle: true;*/
-/* sidebar-mode: false;*/
-/* hover-select: false;*/
-/* eh: 1;*/
-/* auto-select: false;*/
-/* parse-hosts: false;*/
-/* parse-known-hosts: true;*/
-/* combi-modes: "window,run";*/
-/* matching: "normal";*/
-/* tokenize: true;*/
-/* m: "-5";*/
-/* filter: ;*/
-/* dpi: -1;*/
-/* threads: 0;*/
-/* scroll-method: 0;*/
-/* window-format: "{w} {c} {t}";*/
- click-to-exit: true;
-/* max-history-size: 25;*/
-/* combi-hide-mode-prefix: false;*/
-/* combi-display-format: "{mode} {text}";*/
-/* matching-negate-char: '-' /* unsupported */;*/
-/* cache-dir: ;*/
-/* window-thumbnail: false;*/
-/* drun-use-desktop-cache: false;*/
-/* drun-reload-desktop-cache: false;*/
-/* normalize-match: false;*/
- steal-focus: false;
-/* application-fallback-icon: ;*/
-/* refilter-timeout-limit: 8192;*/
- xserver-i300-workaround: false;
-/* pid: "/run/user/1000/rofi.pid";*/
-/* display-window: ;*/
-/* display-windowcd: ;*/
-/* display-run: ;*/
-/* display-ssh: ;*/
-/* display-drun: ;*/
-/* display-combi: ;*/
-/* display-keys: ;*/
-/* display-filebrowser: ;*/
-/* kb-primary-paste: "Control+V,Shift+Insert";*/
-/* kb-secondary-paste: "Control+v,Insert";*/
-/* kb-clear-line: "Control+w";*/
-/* kb-move-front: "Control+a";*/
-/* kb-move-end: "Control+e";*/
-/* kb-move-word-back: "Alt+b,Control+Left";*/
-/* kb-move-word-forward: "Alt+f,Control+Right";*/
-/* kb-move-char-back: "Left,Control+b";*/
-/* kb-move-char-forward: "Right,Control+f";*/
-/* kb-remove-word-back: "Control+Alt+h,Control+BackSpace";*/
-/* kb-remove-word-forward: "Control+Alt+d";*/
-/* kb-remove-char-forward: "Delete,Control+d";*/
-/* kb-remove-char-back: "BackSpace,Shift+BackSpace,Control+h";*/
-/* kb-remove-to-eol: "Control+k";*/
-/* kb-remove-to-sol: "Control+u";*/
-/* kb-accept-entry: "Control+j,Control+m,Return,KP_Enter";*/
-/* kb-accept-custom: "Control+Return";*/
-/* kb-accept-custom-alt: "Control+Shift+Return";*/
-/* kb-accept-alt: "Shift+Return";*/
-/* kb-delete-entry: "Shift+Delete";*/
-/* kb-mode-next: "Shift+Right,Control+Tab";*/
-/* kb-mode-previous: "Shift+Left,Control+ISO_Left_Tab";*/
-/* kb-mode-complete: "Control+l";*/
-/* kb-row-left: "Control+Page_Up";*/
-/* kb-row-right: "Control+Page_Down";*/
-/* kb-row-up: "Up,Control+p";*/
-/* kb-row-down: "Down,Control+n";*/
-/* kb-row-tab: "";*/
-/* kb-element-next: "Tab";*/
-/* kb-element-prev: "ISO_Left_Tab";*/
-/* kb-page-prev: "Page_Up";*/
-/* kb-page-next: "Page_Down";*/
-/* kb-row-first: "Home,KP_Home";*/
-/* kb-row-last: "End,KP_End";*/
-/* kb-row-select: "Control+space";*/
-/* kb-screenshot: "Alt+S";*/
-/* kb-ellipsize: "Alt+period";*/
-/* kb-toggle-case-sensitivity: "grave,dead_grave";*/
-/* kb-toggle-sort: "Alt+grave";*/
-/* kb-cancel: "Escape,Control+g,Control+bracketleft";*/
-/* kb-custom-1: "Alt+1";*/
-/* kb-custom-2: "Alt+2";*/
-/* kb-custom-3: "Alt+3";*/
-/* kb-custom-4: "Alt+4";*/
-/* kb-custom-5: "Alt+5";*/
-/* kb-custom-6: "Alt+6";*/
-/* kb-custom-7: "Alt+7";*/
-/* kb-custom-8: "Alt+8";*/
-/* kb-custom-9: "Alt+9";*/
-/* kb-custom-10: "Alt+0";*/
-/* kb-custom-11: "Alt+exclam";*/
-/* kb-custom-12: "Alt+at";*/
-/* kb-custom-13: "Alt+numbersign";*/
-/* kb-custom-14: "Alt+dollar";*/
-/* kb-custom-15: "Alt+percent";*/
-/* kb-custom-16: "Alt+dead_circumflex";*/
-/* kb-custom-17: "Alt+ampersand";*/
-/* kb-custom-18: "Alt+asterisk";*/
-/* kb-custom-19: "Alt+parenleft";*/
-/* kb-select-1: "Super+1";*/
-/* kb-select-2: "Super+2";*/
-/* kb-select-3: "Super+3";*/
-/* kb-select-4: "Super+4";*/
-/* kb-select-5: "Super+5";*/
-/* kb-select-6: "Super+6";*/
-/* kb-select-7: "Super+7";*/
-/* kb-select-8: "Super+8";*/
-/* kb-select-9: "Super+9";*/
-/* kb-select-10: "Super+0";*/
-/* ml-row-left: "ScrollLeft";*/
-/* ml-row-right: "ScrollRight";*/
-/* ml-row-up: "ScrollUp";*/
-/* ml-row-down: "ScrollDown";*/
-/* me-select-entry: "MousePrimary";*/
-/* me-accept-entry: "MouseDPrimary";*/
-/* me-accept-custom: "Control+MouseDPrimary";*/
- timeout {
- action: "kb-cancel";
- delay: 0;
- }
- filebrowser {
- directories-first: true;
- sorting-method: "name";
- }
-}
-
-@theme "nord"
diff --git a/laptop/.config/rofi/nord.rasi b/laptop/.config/rofi/nord.rasi
deleted file mode 100644
index 4e96467..0000000
--- a/laptop/.config/rofi/nord.rasi
+++ /dev/null
@@ -1,105 +0,0 @@
-/*******************************************************************************
- * ROFI VERTICAL THEME USING THE NORD COLOR PALETTE
- * User : LR-Tech
- * Theme Repo : https://github.com/lr-tech/rofi-themes-collection
- * Nord Project Repo : https://github.com/arcticicestudio/nord
- *******************************************************************************/
-
-* {
- font: "IBM Plex Mono 12";
-
- nord0: #2e3440;
- nord1: #3b4252;
- nord2: #434c5e;
- nord3: #4c566a;
-
- nord4: #d8dee9;
- nord5: #e5e9f0;
- nord6: #eceff4;
-
- nord7: #8fbcbb;
- nord8: #88c0d0;
- nord9: #81a1c1;
- nord10: #5e81ac;
- nord11: #bf616a;
-
- nord12: #d08770;
- nord13: #ebcb8b;
- nord14: #a3be8c;
- nord15: #b48ead;
-
- background-color: transparent;
- text-color: @nord4;
- accent-color: @nord8;
-
- margin: 0px;
- padding: 0px;
- spacing: 0px;
-}
-
-window {
- background-color: @nord0;
- border-color: @accent-color;
-
- location: center;
- width: 480px;
- border: 1px;
-}
-
-inputbar {
- padding: 8px 12px;
- spacing: 12px;
- children: [ prompt, entry ];
-}
-
-prompt, entry, element-text, element-icon {
- vertical-align: 0.5;
-}
-
-prompt {
- text-color: @accent-color;
-}
-
-listview {
- lines: 8;
- columns: 1;
-
- fixed-height: false;
-}
-
-element {
- padding: 8px;
- spacing: 8px;
-}
-
-element normal urgent {
- text-color: @nord13;
-}
-
-element normal active {
- text-color: @accent-color;
-}
-
-element selected {
- text-color: @nord0;
-}
-
-element selected normal {
- background-color: @accent-color;
-}
-
-element selected urgent {
- background-color: @nord13;
-}
-
-element selected active {
- background-color: @nord8;
-}
-
-element-icon {
- size: 0.75em;
-}
-
-element-text {
- text-color: inherit;
-}
diff --git a/laptop/.ideavimrc b/laptop/.ideavimrc
deleted file mode 100644
index f5560e4..0000000
--- a/laptop/.ideavimrc
+++ /dev/null
@@ -1,35 +0,0 @@
-""" 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 , :action IdeaVim.ReloadVimRc.reload
-
-nnoremap
-nnoremap t :action Terminal.OpenInTerminal
-nnoremap q :action QuickJavaDoc
-nnoremap f :action Find
-nnoremap r :action Replace
-
-nnoremap J mzJ`z
-nnoremap S ht lrk$
-
-vnoremap J :m '>+1gv=gv
-vnoremap K :m '<-2gv=gv
-
-map l V(ReformatCode)
diff --git a/laptop/configuration.nix b/systems/laptop/configuration.nix
similarity index 100%
rename from laptop/configuration.nix
rename to systems/laptop/configuration.nix
diff --git a/laptop/gnome.nix b/systems/laptop/gnome.nix
similarity index 100%
rename from laptop/gnome.nix
rename to systems/laptop/gnome.nix
diff --git a/laptop/hardware-configuration.nix b/systems/laptop/hardware-configuration.nix
similarity index 100%
rename from laptop/hardware-configuration.nix
rename to systems/laptop/hardware-configuration.nix
diff --git a/laptop/main.nix b/systems/laptop/main.nix
similarity index 100%
rename from laptop/main.nix
rename to systems/laptop/main.nix
diff --git a/laptop/modules/battery.nix b/systems/laptop/modules/battery.nix
similarity index 100%
rename from laptop/modules/battery.nix
rename to systems/laptop/modules/battery.nix
diff --git a/laptop/modules/wireguard.nix b/systems/laptop/modules/wireguard.nix
similarity index 100%
rename from laptop/modules/wireguard.nix
rename to systems/laptop/modules/wireguard.nix
diff --git a/laptop/plasma.nix b/systems/laptop/plasma.nix
similarity index 100%
rename from laptop/plasma.nix
rename to systems/laptop/plasma.nix
diff --git a/laptop/secrets/secrets.nix b/systems/laptop/secrets/secrets.nix
similarity index 100%
rename from laptop/secrets/secrets.nix
rename to systems/laptop/secrets/secrets.nix
diff --git a/laptop/secrets/wireguard-private.age b/systems/laptop/secrets/wireguard-private.age
similarity index 100%
rename from laptop/secrets/wireguard-private.age
rename to systems/laptop/secrets/wireguard-private.age