diff --git a/configs/filesystems/hw-nemesis.nix b/configs/filesystems/hw-nemesis.nix deleted file mode 100644 index c1aea0d..0000000 --- a/configs/filesystems/hw-nemesis.nix +++ /dev/null @@ -1,15 +0,0 @@ -{ - fileSystems."/" = { - device = "/dev/disk/by-uuid/e5005ea6-6c5a-4ab3-9767-ce7772582024"; - fsType = "ext4"; - }; - - fileSystems."/boot" = { - device = "/dev/disk/by-uuid/6BBE-0E70"; - fsType = "vfat"; - options = [ - "fmask=0077" - "dmask=0077" - ]; - }; -} diff --git a/configs/graphical.nix b/configs/graphical.nix index 157d1ab..e3ba99a 100644 --- a/configs/graphical.nix +++ b/configs/graphical.nix @@ -11,13 +11,10 @@ with pkgs; ./programs/hyprlock.nix ./programs/hyprshade.nix ./programs/kitty.nix - ./programs/spicetify.nix ./programs/spotifyd.nix ./hardware/audio.nix ./hardware/bluetooth.nix - ./hardware/udev.nix ./programs/waybar.nix - ./hardware/vr.nix ]; environment.systemPackages = [ diff --git a/configs/hardware/powermanagement.nix b/configs/hardware/powermanagement.nix deleted file mode 100644 index 98e90ed..0000000 --- a/configs/hardware/powermanagement.nix +++ /dev/null @@ -1,12 +0,0 @@ -{ - powerManagement = { - enable = true; - powertop.enable = true; - }; - services.acpid = { - enable = true; - }; - services.udev.extraRules = '' - ACTION=="add", SUBSYSTEM=="pci", DRIVER=="pcieport", ATTR{power/wakeup}="disabled" - ''; -} diff --git a/configs/hardware/udev.nix b/configs/hardware/udev.nix deleted file mode 100644 index 2c1ad17..0000000 --- a/configs/hardware/udev.nix +++ /dev/null @@ -1,18 +0,0 @@ -{ pkgs, ... }: -{ - hardware.keyboard.qmk.enable = true; - services.udev = { - packages = with pkgs; [ - vial - via - qmk - qmk-udev-rules - qmk_hid - ]; - }; - environment.systemPackages = with pkgs; [ - qmk - qmk-udev-rules - qmk_hid - ]; -} diff --git a/configs/hardware/vr.nix b/configs/hardware/vr.nix deleted file mode 100644 index 1ece2ca..0000000 --- a/configs/hardware/vr.nix +++ /dev/null @@ -1,6 +0,0 @@ -{ - programs.alvr = { - enable = true; - openFirewall = true; - }; -} diff --git a/configs/programs/fzf.nix b/configs/programs/fzf.nix deleted file mode 100644 index ef02739..0000000 --- a/configs/programs/fzf.nix +++ /dev/null @@ -1,7 +0,0 @@ -{ - home-manager.users.rafiq = { - programs.fzf = { - enable = true; - }; - }; -} diff --git a/configs/programs/git.nix b/configs/programs/git.nix index d38ac36..ebb1b4f 100644 --- a/configs/programs/git.nix +++ b/configs/programs/git.nix @@ -1,6 +1,10 @@ { home-manager.users.rafiq = { home.sessionVariables.GIT_CONFIG_GLOBAL = "$HOME/.config/git/config"; + home.shellAliases = { + g = "git"; + gs = "git status"; + }; programs.git = { enable = true; diff --git a/configs/programs/kanata.nix b/configs/programs/kanata.nix deleted file mode 100644 index 1af56f8..0000000 --- a/configs/programs/kanata.nix +++ /dev/null @@ -1,27 +0,0 @@ -{ - services.kanata = { - enable = true; - keyboards.k14 = { - devices = [ "/dev/input/by-id/usb-Keychron_Keychron_K14-event-kbd" ]; - extraDefCfg = "process-unmapped-keys yes"; - config = # lisp - '' - (defsrc) - - (defvar - tap-timeout 200 - home-row-hold-timeout 200 - tt $tap-timeout - hrht $home-row-hold-timeout - ) - - (deflayermap (base) - ;; tap caps lock as enter, hold as left ctrl - ;; tap-hold-release will activate the hold action early - ;; if another key is pressed while it is held. - CapsLock (tap-hold-release 200 200 Escape ControlLeft) - ) - ''; - }; - }; -} diff --git a/configs/programs/spicetify.nix b/configs/programs/spicetify.nix deleted file mode 100644 index e76c714..0000000 --- a/configs/programs/spicetify.nix +++ /dev/null @@ -1,23 +0,0 @@ -{ - inputs, - pkgs, - ... -}: -let - spicePkgs = inputs.spicetify-nix.legacyPackages.${pkgs.stdenv.system}; -in -{ - home-manager.users.rafiq = { - imports = [ - inputs.spicetify-nix.homeManagerModules.spicetify - ]; - programs.spicetify = { - enable = true; - spotifyLaunchFlags = "--enable-features=UseOzonePlatform --ozone-platform=wayland"; - windowManagerPatch = true; - enabledCustomApps = with spicePkgs.apps; [ - marketplace - ]; - }; - }; -} diff --git a/configs/shell.nix b/configs/shell.nix index f1893c8..30e8442 100644 --- a/configs/shell.nix +++ b/configs/shell.nix @@ -6,10 +6,8 @@ ./programs/comma.nix ./programs/direnv.nix ./programs/editorconfig.nix - ./programs/fzf.nix ./programs/git.nix ./programs/hyfetch.nix - ./programs/kanata.nix ./programs/nh.nix ./programs/nvf.nix ./programs/starship.nix @@ -30,21 +28,15 @@ home-manager.users.rafiq.home = { shell.enableShellIntegration = true; shellAliases = { - gs = "git status"; cd = "z"; v = "$EDITOR"; - g = "git"; l = "eza -1lah --git --time-style '+%Y-%m-%d %H:%M'"; # Thanks to https://www.reddit.com/r/NixOS/comments/fsummx/comment/fm3jbcm/! list-all-packages = "nix-store --query --requisites /run/current-system | cut -d- -f2- | sort | uniq"; }; packages = with pkgs; [ - bat - btop # add settings as home-manager module devenv - ripgrep - ttyper eza ]; }; diff --git a/devices/wcorne.vil b/devices/wcorne.vil deleted file mode 100644 index c490bc4..0000000 --- a/devices/wcorne.vil +++ /dev/null @@ -1 +0,0 @@ -{"version": 1, "uid": 3904610095205992439, "layout": [[["KC_NO", "KC_Q", "KC_W", "KC_E", "KC_R", "KC_T", "KC_NO", "KC_Y", "KC_U", "KC_I", "KC_O", "KC_P"], ["KC_NO", "LCTL_T(KC_A)", "LGUI_T(KC_S)", "LALT_T(KC_D)", "LSFT_T(KC_F)", "KC_G", "KC_NO", "KC_H", "RSFT_T(KC_J)", "RALT_T(KC_K)", "RGUI_T(KC_L)", "RCTL_T(KC_SCOLON)"], ["KC_NO", "KC_Z", "KC_X", "KC_C", "KC_V", "KC_B", -1, "KC_N", "KC_M", "KC_COMMA", "KC_DOT", "KC_SLASH"], ["KC_NO", "KC_NO", -1, "KC_NO", "MO(2)", "LCTL_T(KC_SPACE)", "RSFT_T(KC_BSPACE)", "MO(1)", "KC_NO", "KC_NO", "KC_NO", "KC_NO"]], [["KC_NO", "LSFT(KC_1)", "LSFT(KC_2)", "LSFT(KC_3)", "LSFT(KC_4)", "LSFT(KC_5)", "KC_NO", "LSFT(KC_6)", "LSFT(KC_7)", "LSFT(KC_8)", "LSFT(KC_9)", "LSFT(KC_0)"], ["KC_NO", "LCTL_T(KC_NO)", "LGUI_T(KC_NO)", "LALT_T(KC_LBRACKET)", "LSFT_T(KC_RBRACKET)", "LSFT(KC_EQUAL)", "KC_NO", "KC_BSLASH", "RSFT_T(KC_NO)", "RALT_T(KC_NO)", "RGUI_T(KC_NO)", "RCTL_T(KC_NO)"], ["KC_NO", "KC_NO", "KC_NO", "KC_EQUAL", "LSFT(KC_MINUS)", "KC_MINUS", -1, "LSFT(KC_BSLASH)", "KC_QUOTE", "LSFT(KC_QUOTE)", "LSFT(KC_GRAVE)", "KC_GRAVE"], ["KC_NO", "KC_NO", -1, "KC_NO", "MO(3)", "KC_TAB", "KC_NO", "KC_NO", "KC_NO", "KC_NO", "KC_NO", "KC_NO"]], [["KC_NO", "KC_MPLY", "KC_MUTE", "KC_VOLD", "KC_VOLU", "KC_PSCREEN", "KC_NO", "KC_HOME", "KC_PGDOWN", "KC_PGUP", "KC_END", "KC_DELETE"], ["KC_NO", "LCTL_T(KC_TAB)", "LGUI_T(KC_DELETE)", "LALT_T(KC_ESCAPE)", "LSFT_T(KC_ENTER)", "KC_INSERT", "KC_NO", "KC_LEFT", "RSFT_T(KC_DOWN)", "RALT_T(KC_UP)", "RGUI_T(KC_RIGHT)", "RCTL_T(KC_BTN2)"], ["KC_NO", "KC_UNDO", "KC_CUT", "KC_COPY", "KC_PSTE", "KC_NUMLOCK", -1, "KC_MS_L", "KC_MS_D", "KC_MS_U", "KC_MS_R", "KC_BTN2"], ["KC_NO", "KC_NO", -1, "KC_NO", "KC_NO", "KC_NO", "KC_BTN1", "MO(3)", "KC_NO", "KC_NO", "KC_NO", "KC_NO"]], [["KC_NO", "DYN_REC_START1", "DYN_MACRO_PLAY1", "KC_F11", "KC_NO", "KC_NO", "KC_NO", "KC_NO", "KC_NO", "KC_F12", "KC_NO", "KC_NO"], ["KC_NO", "LCTL_T(KC_1)", "LGUI_T(KC_2)", "LALT_T(KC_3)", "LSFT_T(KC_4)", "KC_5", "KC_NO", "KC_6", "RSFT_T(KC_7)", "RALT_T(KC_8)", "RGUI_T(KC_9)", "RCTL_T(KC_0)"], ["KC_NO", "KC_F1", "KC_F2", "KC_F3", "KC_F4", "KC_F5", -1, "KC_F6", "KC_F7", "KC_F8", "KC_F9", "KC_F10"], ["KC_NO", "KC_NO", -1, "KC_NO", "KC_NO", "KC_NO", "KC_NO", "KC_NO", "KC_NO", "KC_NO", "KC_NO", "KC_NO"]], [["KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS"], ["KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS"], ["KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", -1, "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS"], ["KC_TRNS", "KC_TRNS", -1, "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS"]], [["KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS"], ["KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS"], ["KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", -1, "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS"], ["KC_TRNS", "KC_TRNS", -1, "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS"]], [["KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS"], ["KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS"], ["KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", -1, "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS"], ["KC_TRNS", "KC_TRNS", -1, "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS"]], [["KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS"], ["KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS"], ["KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", -1, "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS"], ["KC_TRNS", "KC_TRNS", -1, "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS"]]], "encoder_layout": [[], [], [], [], [], [], [], []], "layout_options": -1, "macro": [[], [], [], [], [], [], [], [], [], [], [], [], [], [], [], []], "vial_protocol": 6, "via_protocol": 9, "tap_dance": [["KC_A", "KC_LGUI", "KC_NO", "KC_NO", 200], ["KC_S", "KC_LALT", "KC_NO", "KC_NO", 200], ["KC_D", "KC_LSHIFT", "KC_NO", "KC_NO", 200], ["KC_F", "KC_LCTRL", "KC_NO", "KC_NO", 200], ["KC_SCOLON", "KC_RGUI", "KC_NO", "KC_NO", 200], ["KC_L", "KC_RALT", "KC_NO", "KC_NO", 200], ["KC_K", "KC_RSHIFT", "KC_NO", "KC_NO", 200], ["KC_J", "KC_RCTRL", "KC_NO", "KC_NO", 200], ["KC_NO", "KC_NO", "KC_NO", "KC_NO", 200], ["KC_NO", "KC_NO", "KC_NO", "KC_NO", 200], ["KC_NO", "KC_NO", "KC_NO", "KC_NO", 200], ["KC_NO", "KC_NO", "KC_NO", "KC_NO", 200], ["KC_NO", "KC_NO", "KC_NO", "KC_NO", 200], ["KC_NO", "KC_NO", "KC_NO", "KC_NO", 200], ["KC_NO", "KC_NO", "KC_NO", "KC_NO", 200], ["KC_NO", "KC_NO", "KC_NO", "KC_NO", 200], ["KC_NO", "KC_NO", "KC_NO", "KC_NO", 200], ["KC_NO", "KC_NO", "KC_NO", "KC_NO", 200], ["KC_NO", "KC_NO", "KC_NO", "KC_NO", 200], ["KC_NO", "KC_NO", "KC_NO", "KC_NO", 200], ["KC_NO", "KC_NO", "KC_NO", "KC_NO", 200], ["KC_NO", "KC_NO", "KC_NO", "KC_NO", 200], ["KC_NO", "KC_NO", "KC_NO", "KC_NO", 200], ["KC_NO", "KC_NO", "KC_NO", "KC_NO", 200], ["KC_NO", "KC_NO", "KC_NO", "KC_NO", 200], ["KC_NO", "KC_NO", "KC_NO", "KC_NO", 200], ["KC_NO", "KC_NO", "KC_NO", "KC_NO", 200], ["KC_NO", "KC_NO", "KC_NO", "KC_NO", 200], ["KC_NO", "KC_NO", "KC_NO", "KC_NO", 200], ["KC_NO", "KC_NO", "KC_NO", "KC_NO", 200], ["KC_NO", "KC_NO", "KC_NO", "KC_NO", 200], ["KC_NO", "KC_NO", "KC_NO", "KC_NO", 200]], "combo": [["RSFT_T(KC_J)", "RALT_T(KC_K)", "RGUI_T(KC_L)", "RCTL_T(KC_SCOLON)", "KC_ESCAPE"], ["RALT_T(KC_K)", "RGUI_T(KC_L)", "KC_NO", "KC_NO", "KC_ENTER"], ["KC_SPACE", "KC_BSPACE", "KC_NO", "KC_NO", "OSM(MOD_LGUI)"], ["KC_NO", "KC_NO", "KC_NO", "KC_NO", "KC_NO"], ["KC_NO", "KC_NO", "KC_NO", "KC_NO", "KC_NO"], ["KC_NO", "KC_NO", "KC_NO", "KC_NO", "KC_NO"], ["KC_NO", "KC_NO", "KC_NO", "KC_NO", "KC_NO"], ["KC_NO", "KC_NO", "KC_NO", "KC_NO", "KC_NO"], ["KC_NO", "KC_NO", "KC_NO", "KC_NO", "KC_NO"], ["KC_NO", "KC_NO", "KC_NO", "KC_NO", "KC_NO"], ["KC_NO", "KC_NO", "KC_NO", "KC_NO", "KC_NO"], ["KC_NO", "KC_NO", "KC_NO", "KC_NO", "KC_NO"], ["KC_NO", "KC_NO", "KC_NO", "KC_NO", "KC_NO"], ["KC_NO", "KC_NO", "KC_NO", "KC_NO", "KC_NO"], ["KC_NO", "KC_NO", "KC_NO", "KC_NO", "KC_NO"], ["KC_NO", "KC_NO", "KC_NO", "KC_NO", "KC_NO"], ["KC_NO", "KC_NO", "KC_NO", "KC_NO", "KC_NO"], ["KC_NO", "KC_NO", "KC_NO", "KC_NO", "KC_NO"], ["KC_NO", "KC_NO", "KC_NO", "KC_NO", "KC_NO"], ["KC_NO", "KC_NO", "KC_NO", "KC_NO", "KC_NO"], ["KC_NO", "KC_NO", "KC_NO", "KC_NO", "KC_NO"], ["KC_NO", "KC_NO", "KC_NO", "KC_NO", "KC_NO"], ["KC_NO", "KC_NO", "KC_NO", "KC_NO", "KC_NO"], ["KC_NO", "KC_NO", "KC_NO", "KC_NO", "KC_NO"], ["KC_NO", "KC_NO", "KC_NO", "KC_NO", "KC_NO"], ["KC_NO", "KC_NO", "KC_NO", "KC_NO", "KC_NO"], ["KC_NO", "KC_NO", "KC_NO", "KC_NO", "KC_NO"], ["KC_NO", "KC_NO", "KC_NO", "KC_NO", "KC_NO"], ["KC_NO", "KC_NO", "KC_NO", "KC_NO", "KC_NO"], ["KC_NO", "KC_NO", "KC_NO", "KC_NO", "KC_NO"], ["KC_NO", "KC_NO", "KC_NO", "KC_NO", "KC_NO"], ["KC_NO", "KC_NO", "KC_NO", "KC_NO", "KC_NO"]], "key_override": [{"trigger": "KC_NO", "replacement": "KC_NO", "layers": 65535, "trigger_mods": 0, "negative_mod_mask": 0, "suppressed_mods": 0, "options": 7}, {"trigger": "KC_NO", "replacement": "KC_NO", "layers": 65535, "trigger_mods": 0, "negative_mod_mask": 0, "suppressed_mods": 0, "options": 7}, {"trigger": "KC_NO", "replacement": "KC_NO", "layers": 65535, "trigger_mods": 0, "negative_mod_mask": 0, "suppressed_mods": 0, "options": 7}, {"trigger": "KC_NO", "replacement": "KC_NO", "layers": 65535, "trigger_mods": 0, "negative_mod_mask": 0, "suppressed_mods": 0, "options": 7}, {"trigger": "KC_NO", "replacement": "KC_NO", "layers": 65535, "trigger_mods": 0, "negative_mod_mask": 0, "suppressed_mods": 0, "options": 7}, {"trigger": "KC_NO", "replacement": "KC_NO", "layers": 65535, "trigger_mods": 0, "negative_mod_mask": 0, "suppressed_mods": 0, "options": 7}, {"trigger": "KC_NO", "replacement": "KC_NO", "layers": 65535, "trigger_mods": 0, "negative_mod_mask": 0, "suppressed_mods": 0, "options": 7}, {"trigger": "KC_NO", "replacement": "KC_NO", "layers": 65535, "trigger_mods": 0, "negative_mod_mask": 0, "suppressed_mods": 0, "options": 7}, {"trigger": "KC_NO", "replacement": "KC_NO", "layers": 65535, "trigger_mods": 0, "negative_mod_mask": 0, "suppressed_mods": 0, "options": 7}, {"trigger": "KC_NO", "replacement": "KC_NO", "layers": 65535, "trigger_mods": 0, "negative_mod_mask": 0, "suppressed_mods": 0, "options": 7}, {"trigger": "KC_NO", "replacement": "KC_NO", "layers": 65535, "trigger_mods": 0, "negative_mod_mask": 0, "suppressed_mods": 0, "options": 7}, {"trigger": "KC_NO", "replacement": "KC_NO", "layers": 65535, "trigger_mods": 0, "negative_mod_mask": 0, "suppressed_mods": 0, "options": 7}, {"trigger": "KC_NO", "replacement": "KC_NO", "layers": 65535, "trigger_mods": 0, "negative_mod_mask": 0, "suppressed_mods": 0, "options": 7}, {"trigger": "KC_NO", "replacement": "KC_NO", "layers": 65535, "trigger_mods": 0, "negative_mod_mask": 0, "suppressed_mods": 0, "options": 7}, {"trigger": "KC_NO", "replacement": "KC_NO", "layers": 65535, "trigger_mods": 0, "negative_mod_mask": 0, "suppressed_mods": 0, "options": 7}, {"trigger": "KC_NO", "replacement": "KC_NO", "layers": 65535, "trigger_mods": 0, "negative_mod_mask": 0, "suppressed_mods": 0, "options": 7}, {"trigger": "KC_NO", "replacement": "KC_NO", "layers": 65535, "trigger_mods": 0, "negative_mod_mask": 0, "suppressed_mods": 0, "options": 7}, {"trigger": "KC_NO", "replacement": "KC_NO", "layers": 65535, "trigger_mods": 0, "negative_mod_mask": 0, "suppressed_mods": 0, "options": 7}, {"trigger": "KC_NO", "replacement": "KC_NO", "layers": 65535, "trigger_mods": 0, "negative_mod_mask": 0, "suppressed_mods": 0, "options": 7}, {"trigger": "KC_NO", "replacement": "KC_NO", "layers": 65535, "trigger_mods": 0, "negative_mod_mask": 0, "suppressed_mods": 0, "options": 7}, {"trigger": "KC_NO", "replacement": "KC_NO", "layers": 65535, "trigger_mods": 0, "negative_mod_mask": 0, "suppressed_mods": 0, "options": 7}, {"trigger": "KC_NO", "replacement": "KC_NO", "layers": 65535, "trigger_mods": 0, "negative_mod_mask": 0, "suppressed_mods": 0, "options": 7}, {"trigger": "KC_NO", "replacement": "KC_NO", "layers": 65535, "trigger_mods": 0, "negative_mod_mask": 0, "suppressed_mods": 0, "options": 7}, {"trigger": "KC_NO", "replacement": "KC_NO", "layers": 65535, "trigger_mods": 0, "negative_mod_mask": 0, "suppressed_mods": 0, "options": 7}, {"trigger": "KC_NO", "replacement": "KC_NO", "layers": 65535, "trigger_mods": 0, "negative_mod_mask": 0, "suppressed_mods": 0, "options": 7}, {"trigger": "KC_NO", "replacement": "KC_NO", "layers": 65535, "trigger_mods": 0, "negative_mod_mask": 0, "suppressed_mods": 0, "options": 7}, {"trigger": "KC_NO", "replacement": "KC_NO", "layers": 65535, "trigger_mods": 0, "negative_mod_mask": 0, "suppressed_mods": 0, "options": 7}, {"trigger": "KC_NO", "replacement": "KC_NO", "layers": 65535, "trigger_mods": 0, "negative_mod_mask": 0, "suppressed_mods": 0, "options": 7}, {"trigger": "KC_NO", "replacement": "KC_NO", "layers": 65535, "trigger_mods": 0, "negative_mod_mask": 0, "suppressed_mods": 0, "options": 7}, {"trigger": "KC_NO", "replacement": "KC_NO", "layers": 65535, "trigger_mods": 0, "negative_mod_mask": 0, "suppressed_mods": 0, "options": 7}, {"trigger": "KC_NO", "replacement": "KC_NO", "layers": 65535, "trigger_mods": 0, "negative_mod_mask": 0, "suppressed_mods": 0, "options": 7}, {"trigger": "KC_NO", "replacement": "KC_NO", "layers": 65535, "trigger_mods": 0, "negative_mod_mask": 0, "suppressed_mods": 0, "options": 7}], "settings": {"1": 0, "2": 50, "3": 0, "4": 175, "5": 0, "6": 5000, "7": 200, "8": 6, "9": 0, "10": 20, "11": 5, "12": 10, "13": 30, "14": 10, "15": 80, "16": 8, "17": 40, "18": 0, "19": 0, "20": 0, "21": 128}} \ No newline at end of file diff --git a/flake.nix b/flake.nix index 43db6b6..50cbbcd 100644 --- a/flake.nix +++ b/flake.nix @@ -35,9 +35,7 @@ (mkSystem "graphical" "nemesis" "nvme-nvme.c0a9-323332354536453737343334-435432303030503353534438-00000001" ) - (mkSystem "graphical" "mellinoe" "/dev/disk/by-id/nvme-eui.01000000000000008ce38e04019a68ab") (mkSystem "headless" "apollo" "/dev/disk/by-id/nvme-eui.002538d221b47b01") - (mkSystem "headless" "eurus" "/dev/disk/by-id/scsi-0QEMU_QEMU_HARDDISK_drive-scsi0-0-0-0") ]; }; inputs = { diff --git a/hosts/nemesis.nix b/hosts/nemesis.nix index 5753c2e..46e4069 100644 --- a/hosts/nemesis.nix +++ b/hosts/nemesis.nix @@ -1,10 +1,5 @@ { inputs, ... }: { - imports = [ - ../configs/filesystems/hw-nemesis.nix - ../configs/hardware/powermanagement.nix - inputs.nixos-hardware.nixosModules.gigabyte-b650 - ]; boot-config.bootloader = "systemd-boot"; hardware-config.cpu = "amd"; hardware-config.gpu = "nvidia"; @@ -12,4 +7,18 @@ fs-config.mountHeliosData = true; nw-config.wol.enable = true; nw-config.wol.interface = "enp12s0"; + + fileSystems."/" = { + device = "/dev/disk/by-uuid/e5005ea6-6c5a-4ab3-9767-ce7772582024"; + fsType = "ext4"; + }; + + fileSystems."/boot" = { + device = "/dev/disk/by-uuid/6BBE-0E70"; + fsType = "vfat"; + options = [ + "fmask=0077" + "dmask=0077" + ]; + }; }