From 709db1985b538d602f543398b4d82f2878992a4d Mon Sep 17 00:00:00 2001 From: gpskwlkr Date: Tue, 26 Mar 2024 23:45:56 +0400 Subject: [PATCH] update --- configuration.nix | 5 + flake.nix | 41 +------ hardware-configuration.nix | 13 +- home.nix | 114 ------------------ {user => home}/config/btop/btop.conf | 0 .../btop/themes/catppuccin_macchiato.theme | 0 {user => home}/config/hypr/bind.conf | 0 {user => home}/config/hypr/exec.conf | 0 {user => home}/config/hypr/hyprland.conf | 0 {user => home}/config/hypr/hyprpaper.conf | 0 {user => home}/config/hypr/input.conf | 0 {user => home}/config/hypr/monitor.conf | 0 {user => home}/config/hypr/window.conf | 0 {user => home}/config/hypr/windowrule.conf | 0 {user => home}/config/kitty/kitty.conf | 0 {user => home}/config/kitty/mocha.conf | 0 {user => home}/config/mako/config | 0 {user => home}/config/neofetch/config | 0 {user => home}/config/nvim/init.lua | 0 {user => home}/config/nvim/lazy-lock.json | 0 .../config/nvim/lua/gpskwlkr/core/init.lua | 0 .../config/nvim/lua/gpskwlkr/core/keymaps.lua | 0 .../config/nvim/lua/gpskwlkr/core/options.lua | 0 .../config/nvim/lua/gpskwlkr/lazy.lua | 0 .../nvim/lua/gpskwlkr/plugins/bufferline.lua | 0 .../nvim/lua/gpskwlkr/plugins/colorizer.lua | 0 .../nvim/lua/gpskwlkr/plugins/colorscheme.lua | 0 .../nvim/lua/gpskwlkr/plugins/comment.lua | 0 .../nvim/lua/gpskwlkr/plugins/dressing.lua | 0 .../nvim/lua/gpskwlkr/plugins/formatting.lua | 0 .../nvim/lua/gpskwlkr/plugins/gitsigns.lua | 0 .../config/nvim/lua/gpskwlkr/plugins/init.lua | 0 .../nvim/lua/gpskwlkr/plugins/linting.lua | 0 .../lua/gpskwlkr/plugins/lsp/lspconfig.lua | 0 .../nvim/lua/gpskwlkr/plugins/lsp/mason.lua | 0 .../nvim/lua/gpskwlkr/plugins/lsp/none-ls.lua | 0 .../nvim/lua/gpskwlkr/plugins/lualine.lua | 0 .../lua/gpskwlkr/plugins/nvim-autopairs.lua | 0 .../nvim/lua/gpskwlkr/plugins/nvim-cmp.lua | 0 .../lua/gpskwlkr/plugins/nvim-surround.lua | 0 .../nvim/lua/gpskwlkr/plugins/nvim-tree.lua | 0 .../lua/gpskwlkr/plugins/nvim-treesitter.lua | 0 .../nvim/lua/gpskwlkr/plugins/telescope.lua | 0 {user => home}/config/swayidle/config | 0 {user => home}/config/swaylock/config | 0 .../config/wallpapers/wallpaper.jpg | Bin {user => home}/config/waybar/config.jsonc | 0 .../config/waybar/scripts/waybar-wttr.py | 0 {user => home}/config/waybar/style.css | 0 .../config/wlogout/icons/hibernate.png | Bin {user => home}/config/wlogout/icons/lock.png | Bin .../config/wlogout/icons/logout.png | Bin .../config/wlogout/icons/reboot.png | Bin .../config/wlogout/icons/shutdown.png | Bin .../config/wlogout/icons/suspend.png | Bin {user => home}/config/wlogout/layout | 0 {user => home}/config/wlogout/style.css | 0 {user => home}/config/wofi/style.css | 0 home/default.nix | 12 ++ home/user/config.nix | 18 +++ home/user/default.nix | 11 ++ home/user/environment.nix | 31 +++++ user/git/default.nix => home/user/git.nix | 0 home/user/gtk.nix | 24 ++++ home/user/packages.nix | 59 +++++++++ home/user/programs.nix | 20 +++ user/sh.nix => home/user/shell.nix | 0 system/{ => modules}/boot.nix | 9 +- system/modules/default.nix | 27 +++++ system/{ => modules}/fonts.nix | 0 system/{ => modules}/gaming.nix | 9 +- system/{ => modules}/hardware.nix | 0 system/{ => modules}/hyprland.nix | 0 system/{ => modules}/internationalisation.nix | 0 system/{ => modules}/misc.nix | 0 system/{ => modules}/networking.nix | 0 system/{ => modules}/nixsettings.nix | 10 -- system/{ => modules}/packages.nix | 0 system/{ => modules}/polkit.nix | 0 system/modules/programming.nix | 7 ++ system/{ => modules}/programs.nix | 16 +++ system/{ => modules}/security.nix | 0 system/{ => modules}/services.nix | 0 system/{ => modules}/sound.nix | 0 system/{ => modules}/theme.nix | 0 system/{ => modules}/time.nix | 0 system/{ => modules}/users.nix | 0 system/{ => modules}/virtualisation.nix | 0 system/modules/work.nix | 7 ++ system/programming.nix | 19 --- system/work.nix | 11 -- 91 files changed, 251 insertions(+), 212 deletions(-) delete mode 100644 home.nix rename {user => home}/config/btop/btop.conf (100%) rename {user => home}/config/btop/themes/catppuccin_macchiato.theme (100%) rename {user => home}/config/hypr/bind.conf (100%) rename {user => home}/config/hypr/exec.conf (100%) rename {user => home}/config/hypr/hyprland.conf (100%) rename {user => home}/config/hypr/hyprpaper.conf (100%) rename {user => home}/config/hypr/input.conf (100%) rename {user => home}/config/hypr/monitor.conf (100%) rename {user => home}/config/hypr/window.conf (100%) rename {user => home}/config/hypr/windowrule.conf (100%) rename {user => home}/config/kitty/kitty.conf (100%) rename {user => home}/config/kitty/mocha.conf (100%) rename {user => home}/config/mako/config (100%) rename {user => home}/config/neofetch/config (100%) rename {user => home}/config/nvim/init.lua (100%) rename {user => home}/config/nvim/lazy-lock.json (100%) rename {user => home}/config/nvim/lua/gpskwlkr/core/init.lua (100%) rename {user => home}/config/nvim/lua/gpskwlkr/core/keymaps.lua (100%) rename {user => home}/config/nvim/lua/gpskwlkr/core/options.lua (100%) rename {user => home}/config/nvim/lua/gpskwlkr/lazy.lua (100%) rename {user => home}/config/nvim/lua/gpskwlkr/plugins/bufferline.lua (100%) rename {user => home}/config/nvim/lua/gpskwlkr/plugins/colorizer.lua (100%) rename {user => home}/config/nvim/lua/gpskwlkr/plugins/colorscheme.lua (100%) rename {user => home}/config/nvim/lua/gpskwlkr/plugins/comment.lua (100%) rename {user => home}/config/nvim/lua/gpskwlkr/plugins/dressing.lua (100%) rename {user => home}/config/nvim/lua/gpskwlkr/plugins/formatting.lua (100%) rename {user => home}/config/nvim/lua/gpskwlkr/plugins/gitsigns.lua (100%) rename {user => home}/config/nvim/lua/gpskwlkr/plugins/init.lua (100%) rename {user => home}/config/nvim/lua/gpskwlkr/plugins/linting.lua (100%) rename {user => home}/config/nvim/lua/gpskwlkr/plugins/lsp/lspconfig.lua (100%) rename {user => home}/config/nvim/lua/gpskwlkr/plugins/lsp/mason.lua (100%) rename {user => home}/config/nvim/lua/gpskwlkr/plugins/lsp/none-ls.lua (100%) rename {user => home}/config/nvim/lua/gpskwlkr/plugins/lualine.lua (100%) rename {user => home}/config/nvim/lua/gpskwlkr/plugins/nvim-autopairs.lua (100%) rename {user => home}/config/nvim/lua/gpskwlkr/plugins/nvim-cmp.lua (100%) rename {user => home}/config/nvim/lua/gpskwlkr/plugins/nvim-surround.lua (100%) rename {user => home}/config/nvim/lua/gpskwlkr/plugins/nvim-tree.lua (100%) rename {user => home}/config/nvim/lua/gpskwlkr/plugins/nvim-treesitter.lua (100%) rename {user => home}/config/nvim/lua/gpskwlkr/plugins/telescope.lua (100%) rename {user => home}/config/swayidle/config (100%) rename {user => home}/config/swaylock/config (100%) rename {user => home}/config/wallpapers/wallpaper.jpg (100%) rename {user => home}/config/waybar/config.jsonc (100%) rename {user => home}/config/waybar/scripts/waybar-wttr.py (100%) rename {user => home}/config/waybar/style.css (100%) rename {user => home}/config/wlogout/icons/hibernate.png (100%) rename {user => home}/config/wlogout/icons/lock.png (100%) rename {user => home}/config/wlogout/icons/logout.png (100%) rename {user => home}/config/wlogout/icons/reboot.png (100%) rename {user => home}/config/wlogout/icons/shutdown.png (100%) rename {user => home}/config/wlogout/icons/suspend.png (100%) rename {user => home}/config/wlogout/layout (100%) rename {user => home}/config/wlogout/style.css (100%) rename {user => home}/config/wofi/style.css (100%) create mode 100644 home/default.nix create mode 100644 home/user/config.nix create mode 100644 home/user/default.nix create mode 100644 home/user/environment.nix rename user/git/default.nix => home/user/git.nix (100%) create mode 100644 home/user/gtk.nix create mode 100644 home/user/packages.nix create mode 100644 home/user/programs.nix rename user/sh.nix => home/user/shell.nix (100%) rename system/{ => modules}/boot.nix (76%) create mode 100644 system/modules/default.nix rename system/{ => modules}/fonts.nix (100%) rename system/{ => modules}/gaming.nix (72%) rename system/{ => modules}/hardware.nix (100%) rename system/{ => modules}/hyprland.nix (100%) rename system/{ => modules}/internationalisation.nix (100%) rename system/{ => modules}/misc.nix (100%) rename system/{ => modules}/networking.nix (100%) rename system/{ => modules}/nixsettings.nix (75%) rename system/{ => modules}/packages.nix (100%) rename system/{ => modules}/polkit.nix (100%) create mode 100644 system/modules/programming.nix rename system/{ => modules}/programs.nix (84%) rename system/{ => modules}/security.nix (100%) rename system/{ => modules}/services.nix (100%) rename system/{ => modules}/sound.nix (100%) rename system/{ => modules}/theme.nix (100%) rename system/{ => modules}/time.nix (100%) rename system/{ => modules}/users.nix (100%) rename system/{ => modules}/virtualisation.nix (100%) create mode 100644 system/modules/work.nix delete mode 100644 system/programming.nix delete mode 100644 system/work.nix diff --git a/configuration.nix b/configuration.nix index 22753ee..d3f28ce 100644 --- a/configuration.nix +++ b/configuration.nix @@ -1,6 +1,11 @@ { config, lib, pkgs, ... }: { + imports = [ + ./hardware-configuration.nix + ./system/modules + ]; + system.stateVersion = "23.11"; } diff --git a/flake.nix b/flake.nix index e46989e..cc97418 100644 --- a/flake.nix +++ b/flake.nix @@ -30,45 +30,8 @@ nixosConfigurations.nixos-personal = lib.nixosSystem { inherit system; modules = [ - ./configuration.nix - ./hardware-configuration.nix - ./system/boot.nix - ./system/fonts.nix - ./system/gaming.nix - ./system/hardware.nix - ./system/hyprland.nix - ./system/internationalisation.nix - ./system/misc.nix - ./system/networking.nix - ./system/nixsettings.nix - ./system/packages.nix - ./system/polkit.nix - ./system/programming.nix - ./system/programs.nix - ./system/security.nix - ./system/services.nix - ./system/sound.nix - ./system/time.nix - ./system/users.nix - ./system/virtualisation.nix - ./system/theme.nix - ./system/work.nix - + ./configuration.nix lanzaboote.nixosModules.lanzaboote - - - ({pkgs, lib, ...}: { - environment.systemPackages = [ - pkgs.sbctl - ]; - - boot.loader.systemd-boot.enable = lib.mkForce false; - - boot.lanzaboote = { - enable = true; - pkiBundle = "/etc/secureboot"; - }; - }) ]; specialArgs = { inherit pkgs-unstable; @@ -78,7 +41,7 @@ homeConfigurations = { gpskwlkr = home-manager.lib.homeManagerConfiguration { inherit pkgs; - modules = [ ./home.nix ]; + modules = [ ./home ]; extraSpecialArgs = { inherit pkgs-unstable; inherit inputs; diff --git a/hardware-configuration.nix b/hardware-configuration.nix index 4ce05a1..947f739 100644 --- a/hardware-configuration.nix +++ b/hardware-configuration.nix @@ -14,24 +14,17 @@ boot.extraModulePackages = [ ]; fileSystems."/" = - { device = "/dev/disk/by-uuid/755bd859-a650-4acd-99a3-d48ef8119370"; + { device = "/dev/disk/by-uuid/e77340bd-65f6-48f1-baa6-6b17aae6666a"; fsType = "ext4"; }; fileSystems."/boot" = - { device = "/dev/disk/by-uuid/3E0E-A359"; + { device = "/dev/disk/by-uuid/EE4B-9C10"; fsType = "vfat"; }; - fileSystems."/home/gpskwlkr/HDD" = - { - device = "/dev/disk/by-uuid/5ffff838-c04f-4a9b-aa5c-b985e52b6993"; - fsType = "ext4"; - options = [ "defaults,noatime" ]; - }; - swapDevices = - [ { device = "/dev/disk/by-uuid/dd5fab99-0fad-4dc6-bb4c-723245e9f477"; } + [ { device = "/dev/disk/by-uuid/ed488302-476e-4bc2-8516-1ce11271b0dc"; } ]; # Enables DHCP on each ethernet and wireless interface. In case of scripted networking diff --git a/home.nix b/home.nix deleted file mode 100644 index b064cb7..0000000 --- a/home.nix +++ /dev/null @@ -1,114 +0,0 @@ -{ config, pkgs, pkgs-unstable, lib, inputs, ... }: -let configDir = ./user/config; -in -{ - imports = [ - ./user/sh.nix - ./user/git - ]; - - home.username = "gpskwlkr"; - home.homeDirectory = "/home/gpskwlkr"; - home.stateVersion = "23.11"; - - home.packages = [ - pkgs.nnn - pkgs.qbittorrent - pkgs.telegram-desktop - pkgs.fnm - pkgs.blueberry - - pkgs-unstable.vesktop - pkgs-unstable.hyprshot - pkgs-unstable.discord-screenaudio - ]; - - - # FIX: make it automatically scan config dir and symlink all folders - home.file = { - ".config/nvim".source = "${configDir}/nvim"; - ".config/wallpapers".source = "${configDir}/wallpapers"; - ".config/kitty".source = "${configDir}/kitty"; - ".config/neofetch".source = "${configDir}/neofetch"; - ".config/hypr".source = "${configDir}/hypr"; - ".config/swayidle".source = "${configDir}/swayidle"; - ".config/swaylock".source = "${configDir}/swaylock"; - ".config/wlogout".source = "${configDir}/wlogout"; - ".config/waybar".source = "${configDir}/waybar"; - ".config/btop".source = "${configDir}/btop"; - ".config/wofi".source = "${configDir}/wofi"; - ".config/mako".source = "${configDir}/mako"; - }; - - gtk = { - enable = true; - - cursorTheme = { - name = "Catppuccin-Macchiato-Teal"; - package = pkgs.catppuccin-gtk; - }; - - gtk3.extraConfig = { - Settings = '' - gtk-application-prefer-dark-theme = 1; - gtk-cursor-theme-name=Catppuccin-Macchiato-Teal - ''; - }; - - gtk4.extraConfig = { - Settings = '' - gtk-application-prefer-dark-theme = 1; - gtk-cursor-theme-name=Catppuccin-Macchiato-Teal - ''; - }; - }; - - home.sessionVariables = { - BROWSER = "firefox"; - EDITOR = "nvim"; - TERMINAL = "kitty"; - NIXOS_OZONE_WL = "1"; - QT_QPA_PLATFORMTHEME = "gtk3"; - QT_SCALE_FACTOR = "1"; - MOZ_ENABLE_WAYLAND = "1"; - SDL_VIDEODRIVER = "wayland"; - QT_QPA_PLATFORM = "wayland-egl"; - QT_WAYLAND_DISABLE_WINDOWDECORATION = "1"; - QT_AUTO_SCREEN_SCALE_FACTOR = "1"; - WLR_DRM_DEVICES = "/dev/dri/card0"; - WLR_NO_HARDWARE_CURSORS = "1"; - CLUTTER_BACKEND = "wayland"; - WLR_RENDERER = "vulkan"; - XCURSOR_SIZE = "24"; - XDG_CURRENT_DESKTOP = "Hyprland"; - XDG_SESSION_DESKTOP = "Hyprland"; - XDG_SESSION_TYPE = "wayland"; - GTK_USE_PORTAL = "1"; - NIXOS_XDG_OPEN_USE_PORTAL = "1"; - XDG_CACHE_HOME = "\${HOME}/.cache"; - XDG_CONFIG_HOME = "\${HOME}/.config"; - #XDG_BIN_HOME = "\${HOME}/.local/bin"; - XDG_DATA_HOME = "\${HOME}/.local/share"; - - }; - - programs.firefox = { - enable = true; - - profiles.gpskwlkr = { - extensions = with inputs.firefox-addons.packages."x86_64-linux"; [ - bypass-paywalls-clean - darkreader - facebook-container - i-dont-care-about-cookies - proton-pass - to-google-translate - view-image - youtube-shorts-block - ]; - }; - }; - - programs.home-manager.enable = true; -} - diff --git a/user/config/btop/btop.conf b/home/config/btop/btop.conf similarity index 100% rename from user/config/btop/btop.conf rename to home/config/btop/btop.conf diff --git a/user/config/btop/themes/catppuccin_macchiato.theme b/home/config/btop/themes/catppuccin_macchiato.theme similarity index 100% rename from user/config/btop/themes/catppuccin_macchiato.theme rename to home/config/btop/themes/catppuccin_macchiato.theme diff --git a/user/config/hypr/bind.conf b/home/config/hypr/bind.conf similarity index 100% rename from user/config/hypr/bind.conf rename to home/config/hypr/bind.conf diff --git a/user/config/hypr/exec.conf b/home/config/hypr/exec.conf similarity index 100% rename from user/config/hypr/exec.conf rename to home/config/hypr/exec.conf diff --git a/user/config/hypr/hyprland.conf b/home/config/hypr/hyprland.conf similarity index 100% rename from user/config/hypr/hyprland.conf rename to home/config/hypr/hyprland.conf diff --git a/user/config/hypr/hyprpaper.conf b/home/config/hypr/hyprpaper.conf similarity index 100% rename from user/config/hypr/hyprpaper.conf rename to home/config/hypr/hyprpaper.conf diff --git a/user/config/hypr/input.conf b/home/config/hypr/input.conf similarity index 100% rename from user/config/hypr/input.conf rename to home/config/hypr/input.conf diff --git a/user/config/hypr/monitor.conf b/home/config/hypr/monitor.conf similarity index 100% rename from user/config/hypr/monitor.conf rename to home/config/hypr/monitor.conf diff --git a/user/config/hypr/window.conf b/home/config/hypr/window.conf similarity index 100% rename from user/config/hypr/window.conf rename to home/config/hypr/window.conf diff --git a/user/config/hypr/windowrule.conf b/home/config/hypr/windowrule.conf similarity index 100% rename from user/config/hypr/windowrule.conf rename to home/config/hypr/windowrule.conf diff --git a/user/config/kitty/kitty.conf b/home/config/kitty/kitty.conf similarity index 100% rename from user/config/kitty/kitty.conf rename to home/config/kitty/kitty.conf diff --git a/user/config/kitty/mocha.conf b/home/config/kitty/mocha.conf similarity index 100% rename from user/config/kitty/mocha.conf rename to home/config/kitty/mocha.conf diff --git a/user/config/mako/config b/home/config/mako/config similarity index 100% rename from user/config/mako/config rename to home/config/mako/config diff --git a/user/config/neofetch/config b/home/config/neofetch/config similarity index 100% rename from user/config/neofetch/config rename to home/config/neofetch/config diff --git a/user/config/nvim/init.lua b/home/config/nvim/init.lua similarity index 100% rename from user/config/nvim/init.lua rename to home/config/nvim/init.lua diff --git a/user/config/nvim/lazy-lock.json b/home/config/nvim/lazy-lock.json similarity index 100% rename from user/config/nvim/lazy-lock.json rename to home/config/nvim/lazy-lock.json diff --git a/user/config/nvim/lua/gpskwlkr/core/init.lua b/home/config/nvim/lua/gpskwlkr/core/init.lua similarity index 100% rename from user/config/nvim/lua/gpskwlkr/core/init.lua rename to home/config/nvim/lua/gpskwlkr/core/init.lua diff --git a/user/config/nvim/lua/gpskwlkr/core/keymaps.lua b/home/config/nvim/lua/gpskwlkr/core/keymaps.lua similarity index 100% rename from user/config/nvim/lua/gpskwlkr/core/keymaps.lua rename to home/config/nvim/lua/gpskwlkr/core/keymaps.lua diff --git a/user/config/nvim/lua/gpskwlkr/core/options.lua b/home/config/nvim/lua/gpskwlkr/core/options.lua similarity index 100% rename from user/config/nvim/lua/gpskwlkr/core/options.lua rename to home/config/nvim/lua/gpskwlkr/core/options.lua diff --git a/user/config/nvim/lua/gpskwlkr/lazy.lua b/home/config/nvim/lua/gpskwlkr/lazy.lua similarity index 100% rename from user/config/nvim/lua/gpskwlkr/lazy.lua rename to home/config/nvim/lua/gpskwlkr/lazy.lua diff --git a/user/config/nvim/lua/gpskwlkr/plugins/bufferline.lua b/home/config/nvim/lua/gpskwlkr/plugins/bufferline.lua similarity index 100% rename from user/config/nvim/lua/gpskwlkr/plugins/bufferline.lua rename to home/config/nvim/lua/gpskwlkr/plugins/bufferline.lua diff --git a/user/config/nvim/lua/gpskwlkr/plugins/colorizer.lua b/home/config/nvim/lua/gpskwlkr/plugins/colorizer.lua similarity index 100% rename from user/config/nvim/lua/gpskwlkr/plugins/colorizer.lua rename to home/config/nvim/lua/gpskwlkr/plugins/colorizer.lua diff --git a/user/config/nvim/lua/gpskwlkr/plugins/colorscheme.lua b/home/config/nvim/lua/gpskwlkr/plugins/colorscheme.lua similarity index 100% rename from user/config/nvim/lua/gpskwlkr/plugins/colorscheme.lua rename to home/config/nvim/lua/gpskwlkr/plugins/colorscheme.lua diff --git a/user/config/nvim/lua/gpskwlkr/plugins/comment.lua b/home/config/nvim/lua/gpskwlkr/plugins/comment.lua similarity index 100% rename from user/config/nvim/lua/gpskwlkr/plugins/comment.lua rename to home/config/nvim/lua/gpskwlkr/plugins/comment.lua diff --git a/user/config/nvim/lua/gpskwlkr/plugins/dressing.lua b/home/config/nvim/lua/gpskwlkr/plugins/dressing.lua similarity index 100% rename from user/config/nvim/lua/gpskwlkr/plugins/dressing.lua rename to home/config/nvim/lua/gpskwlkr/plugins/dressing.lua diff --git a/user/config/nvim/lua/gpskwlkr/plugins/formatting.lua b/home/config/nvim/lua/gpskwlkr/plugins/formatting.lua similarity index 100% rename from user/config/nvim/lua/gpskwlkr/plugins/formatting.lua rename to home/config/nvim/lua/gpskwlkr/plugins/formatting.lua diff --git a/user/config/nvim/lua/gpskwlkr/plugins/gitsigns.lua b/home/config/nvim/lua/gpskwlkr/plugins/gitsigns.lua similarity index 100% rename from user/config/nvim/lua/gpskwlkr/plugins/gitsigns.lua rename to home/config/nvim/lua/gpskwlkr/plugins/gitsigns.lua diff --git a/user/config/nvim/lua/gpskwlkr/plugins/init.lua b/home/config/nvim/lua/gpskwlkr/plugins/init.lua similarity index 100% rename from user/config/nvim/lua/gpskwlkr/plugins/init.lua rename to home/config/nvim/lua/gpskwlkr/plugins/init.lua diff --git a/user/config/nvim/lua/gpskwlkr/plugins/linting.lua b/home/config/nvim/lua/gpskwlkr/plugins/linting.lua similarity index 100% rename from user/config/nvim/lua/gpskwlkr/plugins/linting.lua rename to home/config/nvim/lua/gpskwlkr/plugins/linting.lua diff --git a/user/config/nvim/lua/gpskwlkr/plugins/lsp/lspconfig.lua b/home/config/nvim/lua/gpskwlkr/plugins/lsp/lspconfig.lua similarity index 100% rename from user/config/nvim/lua/gpskwlkr/plugins/lsp/lspconfig.lua rename to home/config/nvim/lua/gpskwlkr/plugins/lsp/lspconfig.lua diff --git a/user/config/nvim/lua/gpskwlkr/plugins/lsp/mason.lua b/home/config/nvim/lua/gpskwlkr/plugins/lsp/mason.lua similarity index 100% rename from user/config/nvim/lua/gpskwlkr/plugins/lsp/mason.lua rename to home/config/nvim/lua/gpskwlkr/plugins/lsp/mason.lua diff --git a/user/config/nvim/lua/gpskwlkr/plugins/lsp/none-ls.lua b/home/config/nvim/lua/gpskwlkr/plugins/lsp/none-ls.lua similarity index 100% rename from user/config/nvim/lua/gpskwlkr/plugins/lsp/none-ls.lua rename to home/config/nvim/lua/gpskwlkr/plugins/lsp/none-ls.lua diff --git a/user/config/nvim/lua/gpskwlkr/plugins/lualine.lua b/home/config/nvim/lua/gpskwlkr/plugins/lualine.lua similarity index 100% rename from user/config/nvim/lua/gpskwlkr/plugins/lualine.lua rename to home/config/nvim/lua/gpskwlkr/plugins/lualine.lua diff --git a/user/config/nvim/lua/gpskwlkr/plugins/nvim-autopairs.lua b/home/config/nvim/lua/gpskwlkr/plugins/nvim-autopairs.lua similarity index 100% rename from user/config/nvim/lua/gpskwlkr/plugins/nvim-autopairs.lua rename to home/config/nvim/lua/gpskwlkr/plugins/nvim-autopairs.lua diff --git a/user/config/nvim/lua/gpskwlkr/plugins/nvim-cmp.lua b/home/config/nvim/lua/gpskwlkr/plugins/nvim-cmp.lua similarity index 100% rename from user/config/nvim/lua/gpskwlkr/plugins/nvim-cmp.lua rename to home/config/nvim/lua/gpskwlkr/plugins/nvim-cmp.lua diff --git a/user/config/nvim/lua/gpskwlkr/plugins/nvim-surround.lua b/home/config/nvim/lua/gpskwlkr/plugins/nvim-surround.lua similarity index 100% rename from user/config/nvim/lua/gpskwlkr/plugins/nvim-surround.lua rename to home/config/nvim/lua/gpskwlkr/plugins/nvim-surround.lua diff --git a/user/config/nvim/lua/gpskwlkr/plugins/nvim-tree.lua b/home/config/nvim/lua/gpskwlkr/plugins/nvim-tree.lua similarity index 100% rename from user/config/nvim/lua/gpskwlkr/plugins/nvim-tree.lua rename to home/config/nvim/lua/gpskwlkr/plugins/nvim-tree.lua diff --git a/user/config/nvim/lua/gpskwlkr/plugins/nvim-treesitter.lua b/home/config/nvim/lua/gpskwlkr/plugins/nvim-treesitter.lua similarity index 100% rename from user/config/nvim/lua/gpskwlkr/plugins/nvim-treesitter.lua rename to home/config/nvim/lua/gpskwlkr/plugins/nvim-treesitter.lua diff --git a/user/config/nvim/lua/gpskwlkr/plugins/telescope.lua b/home/config/nvim/lua/gpskwlkr/plugins/telescope.lua similarity index 100% rename from user/config/nvim/lua/gpskwlkr/plugins/telescope.lua rename to home/config/nvim/lua/gpskwlkr/plugins/telescope.lua diff --git a/user/config/swayidle/config b/home/config/swayidle/config similarity index 100% rename from user/config/swayidle/config rename to home/config/swayidle/config diff --git a/user/config/swaylock/config b/home/config/swaylock/config similarity index 100% rename from user/config/swaylock/config rename to home/config/swaylock/config diff --git a/user/config/wallpapers/wallpaper.jpg b/home/config/wallpapers/wallpaper.jpg similarity index 100% rename from user/config/wallpapers/wallpaper.jpg rename to home/config/wallpapers/wallpaper.jpg diff --git a/user/config/waybar/config.jsonc b/home/config/waybar/config.jsonc similarity index 100% rename from user/config/waybar/config.jsonc rename to home/config/waybar/config.jsonc diff --git a/user/config/waybar/scripts/waybar-wttr.py b/home/config/waybar/scripts/waybar-wttr.py similarity index 100% rename from user/config/waybar/scripts/waybar-wttr.py rename to home/config/waybar/scripts/waybar-wttr.py diff --git a/user/config/waybar/style.css b/home/config/waybar/style.css similarity index 100% rename from user/config/waybar/style.css rename to home/config/waybar/style.css diff --git a/user/config/wlogout/icons/hibernate.png b/home/config/wlogout/icons/hibernate.png similarity index 100% rename from user/config/wlogout/icons/hibernate.png rename to home/config/wlogout/icons/hibernate.png diff --git a/user/config/wlogout/icons/lock.png b/home/config/wlogout/icons/lock.png similarity index 100% rename from user/config/wlogout/icons/lock.png rename to home/config/wlogout/icons/lock.png diff --git a/user/config/wlogout/icons/logout.png b/home/config/wlogout/icons/logout.png similarity index 100% rename from user/config/wlogout/icons/logout.png rename to home/config/wlogout/icons/logout.png diff --git a/user/config/wlogout/icons/reboot.png b/home/config/wlogout/icons/reboot.png similarity index 100% rename from user/config/wlogout/icons/reboot.png rename to home/config/wlogout/icons/reboot.png diff --git a/user/config/wlogout/icons/shutdown.png b/home/config/wlogout/icons/shutdown.png similarity index 100% rename from user/config/wlogout/icons/shutdown.png rename to home/config/wlogout/icons/shutdown.png diff --git a/user/config/wlogout/icons/suspend.png b/home/config/wlogout/icons/suspend.png similarity index 100% rename from user/config/wlogout/icons/suspend.png rename to home/config/wlogout/icons/suspend.png diff --git a/user/config/wlogout/layout b/home/config/wlogout/layout similarity index 100% rename from user/config/wlogout/layout rename to home/config/wlogout/layout diff --git a/user/config/wlogout/style.css b/home/config/wlogout/style.css similarity index 100% rename from user/config/wlogout/style.css rename to home/config/wlogout/style.css diff --git a/user/config/wofi/style.css b/home/config/wofi/style.css similarity index 100% rename from user/config/wofi/style.css rename to home/config/wofi/style.css diff --git a/home/default.nix b/home/default.nix new file mode 100644 index 0000000..b0ca47f --- /dev/null +++ b/home/default.nix @@ -0,0 +1,12 @@ +{ config, pkgs, pkgs-unstable, lib, inputs, ... }: + +{ + imports = [ + ./user + ]; + + home.username = "gpskwlkr"; + home.homeDirectory = "/home/gpskwlkr"; + home.stateVersion = "23.11"; +} + diff --git a/home/user/config.nix b/home/user/config.nix new file mode 100644 index 0000000..8d0b1f8 --- /dev/null +++ b/home/user/config.nix @@ -0,0 +1,18 @@ +let configDir = ../config; +in +{ + home.file = { + ".config/nvim".source = "${configDir}/nvim"; + ".config/wallpapers".source = "${configDir}/wallpapers"; + ".config/kitty".source = "${configDir}/kitty"; + ".config/neofetch".source = "${configDir}/neofetch"; + ".config/hypr".source = "${configDir}/hypr"; + ".config/swayidle".source = "${configDir}/swayidle"; + ".config/swaylock".source = "${configDir}/swaylock"; + ".config/wlogout".source = "${configDir}/wlogout"; + ".config/waybar".source = "${configDir}/waybar"; + ".config/btop".source = "${configDir}/btop"; + ".config/wofi".source = "${configDir}/wofi"; + ".config/mako".source = "${configDir}/mako"; + }; +} diff --git a/home/user/default.nix b/home/user/default.nix new file mode 100644 index 0000000..bc82fa7 --- /dev/null +++ b/home/user/default.nix @@ -0,0 +1,11 @@ +{ + imports = [ + ./git.nix + ./gtk.nix + ./shell.nix + ./config.nix + ./packages.nix + ./programs.nix + ./environment.nix + ]; +} diff --git a/home/user/environment.nix b/home/user/environment.nix new file mode 100644 index 0000000..f85af35 --- /dev/null +++ b/home/user/environment.nix @@ -0,0 +1,31 @@ +{ + home.sessionVariables = { + BROWSER = "firefox"; + EDITOR = "nvim"; + TERMINAL = "kitty"; + NIXOS_OZONE_WL = "1"; + QT_QPA_PLATFORMTHEME = "gtk3"; + QT_SCALE_FACTOR = "1"; + MOZ_ENABLE_WAYLAND = "1"; + SDL_VIDEODRIVER = "wayland"; + QT_QPA_PLATFORM = "wayland-egl"; + QT_WAYLAND_DISABLE_WINDOWDECORATION = "1"; + QT_AUTO_SCREEN_SCALE_FACTOR = "1"; + GTK_CSD = "0"; + WLR_DRM_DEVICES = "/dev/dri/card0"; + WLR_NO_HARDWARE_CURSORS = "1"; + CLUTTER_BACKEND = "wayland"; + WLR_RENDERER = "vulkan"; + XCURSOR_SIZE = "24"; + XDG_CURRENT_DESKTOP = "Hyprland"; + XDG_SESSION_DESKTOP = "Hyprland"; + XDG_SESSION_TYPE = "wayland"; + GTK_USE_PORTAL = "1"; + NIXOS_XDG_OPEN_USE_PORTAL = "1"; + XDG_CACHE_HOME = "\${HOME}/.cache"; + XDG_CONFIG_HOME = "\${HOME}/.config"; + #XDG_BIN_HOME = "\${HOME}/.local/bin"; + XDG_DATA_HOME = "\${HOME}/.local/share"; + + }; +} diff --git a/user/git/default.nix b/home/user/git.nix similarity index 100% rename from user/git/default.nix rename to home/user/git.nix diff --git a/home/user/gtk.nix b/home/user/gtk.nix new file mode 100644 index 0000000..938f1bd --- /dev/null +++ b/home/user/gtk.nix @@ -0,0 +1,24 @@ +{ + gtk = { + enable = true; + + cursorTheme = { + name = "Catppuccin-Macchiato-Teal"; + package = pkgs.catppuccin-gtk; + }; + + gtk3.extraConfig = { + Settings = '' + gtk-application-prefer-dark-theme = 1; + gtk-cursor-theme-name=Catppuccin-Macchiato-Teal + ''; + }; + + gtk4.extraConfig = { + Settings = '' + gtk-application-prefer-dark-theme = 1; + gtk-cursor-theme-name=Catppuccin-Macchiato-Teal + ''; + }; + }; +} diff --git a/home/user/packages.nix b/home/user/packages.nix new file mode 100644 index 0000000..5fbda0a --- /dev/null +++ b/home/user/packages.nix @@ -0,0 +1,59 @@ +{ + nixpkgs = { + config = { + allowUnfree = true; + allowUnfreePredicate = (_: true); + + permittedInsecurePackages = [ + "electron-25.9.0" # Obsidian + ]; + }; + }; + + home.packages = [ + + # Dev stuff + pkgs.jetbrains.rider + pkgs.dotnet-sdk_8 + pkgs.dotnetPackages.Nuget + pkgs.gcc + pkgs.go + pkgs.lua + pkgs.nodejs_21 + pkgs.nodePackages.pnpm + (pkgs.python3.withPackages (python-pkgs: [ + python-pkgs.pip + python-pkgs.requests + ])) + pkgs.zig + + # Work stuff + pkgs.obsidian + pkgs.teams-for-linux + pkgs.thunderbird + pkgs.zoom-us + + # Bluetooth + pkgs.blueberry + + # Social + pkgs.telegram-desktop + pkgs-unstable.vesktop + + # Gaming + pkgs.steam + pkgs.steam-run + (pkgs.lutris.override { + extraPkgs = pkgs: [ + pkgs.wineWowPackages.stable + pkgs.winetricks + ]; + }) + + # Downloads + pkgs.qbittorrent + + # Utils + pkgs-unstable.hyprshot + ]; +} diff --git a/home/user/programs.nix b/home/user/programs.nix new file mode 100644 index 0000000..f2d64d1 --- /dev/null +++ b/home/user/programs.nix @@ -0,0 +1,20 @@ +{ + programs.firefox = { + enable = true; + + profiles.gpskwlkr = { + extensions = with inputs.firefox-addons.packages."x86_64-linux"; [ + bypass-paywalls-clean + darkreader + facebook-container + i-dont-care-about-cookies + proton-pass + to-google-translate + view-image + youtube-shorts-block + ]; + }; + }; + + programs.home-manager.enable = true; +} diff --git a/user/sh.nix b/home/user/shell.nix similarity index 100% rename from user/sh.nix rename to home/user/shell.nix diff --git a/system/boot.nix b/system/modules/boot.nix similarity index 76% rename from system/boot.nix rename to system/modules/boot.nix index 5b0511d..64d10d7 100644 --- a/system/boot.nix +++ b/system/modules/boot.nix @@ -1,4 +1,4 @@ -{ config, pkgs, ... }: +{ config, pkgs, lib, ... }: { # Switched to lanzaboote Secure Boot @@ -22,6 +22,13 @@ # }; # }; + boot.loader.systemd-boot.enable = lib.mkForce false; + + boot.lanzaboote = { + enable = true; + pkiBundle = "/etc/secureboot"; + }; + environment.systemPackages = with pkgs; [ sbctl ]; diff --git a/system/modules/default.nix b/system/modules/default.nix new file mode 100644 index 0000000..68d8771 --- /dev/null +++ b/system/modules/default.nix @@ -0,0 +1,27 @@ +{ ... }: + +{ + imports = [ + ./boot.nix + ./fonts.nix + ./gaming.nix + ./hardware.nix + ./hyprland.nix + ./internationalisation.nix + ./misc.nix + ./networking.nix + ./nixsettings.nix + ./packages.nix + ./polkit.nix + ./programming.nix + ./programs.nix + ./security.nix + ./services.nix + ./sound.nix + ./theme.nix + ./time.nix + ./users.nix + ./virtualisation.nix + ./work.nix + ]; +} diff --git a/system/fonts.nix b/system/modules/fonts.nix similarity index 100% rename from system/fonts.nix rename to system/modules/fonts.nix diff --git a/system/gaming.nix b/system/modules/gaming.nix similarity index 72% rename from system/gaming.nix rename to system/modules/gaming.nix index f9f728f..ad204dc 100644 --- a/system/gaming.nix +++ b/system/modules/gaming.nix @@ -12,13 +12,6 @@ }; environment.systemPackages = with pkgs; [ - steam - steam-run - (lutris.override { - extraPkgs = pkgs: [ - wineWowPackages.stable - winetricks - ]; - }) + ]; } diff --git a/system/hardware.nix b/system/modules/hardware.nix similarity index 100% rename from system/hardware.nix rename to system/modules/hardware.nix diff --git a/system/hyprland.nix b/system/modules/hyprland.nix similarity index 100% rename from system/hyprland.nix rename to system/modules/hyprland.nix diff --git a/system/internationalisation.nix b/system/modules/internationalisation.nix similarity index 100% rename from system/internationalisation.nix rename to system/modules/internationalisation.nix diff --git a/system/misc.nix b/system/modules/misc.nix similarity index 100% rename from system/misc.nix rename to system/modules/misc.nix diff --git a/system/networking.nix b/system/modules/networking.nix similarity index 100% rename from system/networking.nix rename to system/modules/networking.nix diff --git a/system/nixsettings.nix b/system/modules/nixsettings.nix similarity index 75% rename from system/nixsettings.nix rename to system/modules/nixsettings.nix index 5dbd4ac..a8215aa 100644 --- a/system/nixsettings.nix +++ b/system/modules/nixsettings.nix @@ -18,14 +18,4 @@ options = "--delete-older-than 7d"; }; }; - - nixpkgs = { - config = { - allowUnfree = true; - - permittedInsecurePackages = [ - "electron-25.9.0" # obsidian - ]; - }; - }; } diff --git a/system/packages.nix b/system/modules/packages.nix similarity index 100% rename from system/packages.nix rename to system/modules/packages.nix diff --git a/system/polkit.nix b/system/modules/polkit.nix similarity index 100% rename from system/polkit.nix rename to system/modules/polkit.nix diff --git a/system/modules/programming.nix b/system/modules/programming.nix new file mode 100644 index 0000000..935f8b0 --- /dev/null +++ b/system/modules/programming.nix @@ -0,0 +1,7 @@ +{ pkgs, ... }: + +{ + environment.systemPackages = with pkgs; [ + + ]; +} diff --git a/system/programs.nix b/system/modules/programs.nix similarity index 84% rename from system/programs.nix rename to system/modules/programs.nix index 5cac421..64dd1bf 100644 --- a/system/programs.nix +++ b/system/modules/programs.nix @@ -2,6 +2,16 @@ { + xdg.portal = { + enable = true; + wlr.enable = false; + xdgOpenUsePortal = false; + extraPortals = [ + pkgs.xdg-desktop-portal-hyprland + pkgs.xdg-desktop-portal-gtk + ]; + }; + programs = { steam = { enable = true; @@ -11,6 +21,12 @@ hyprland = { enable = true; + + xwayland = { + enable = true; + }; + + portalPackage = pkgs.xdg-desktop-portal-hyprland; }; gnupg = { diff --git a/system/security.nix b/system/modules/security.nix similarity index 100% rename from system/security.nix rename to system/modules/security.nix diff --git a/system/services.nix b/system/modules/services.nix similarity index 100% rename from system/services.nix rename to system/modules/services.nix diff --git a/system/sound.nix b/system/modules/sound.nix similarity index 100% rename from system/sound.nix rename to system/modules/sound.nix diff --git a/system/theme.nix b/system/modules/theme.nix similarity index 100% rename from system/theme.nix rename to system/modules/theme.nix diff --git a/system/time.nix b/system/modules/time.nix similarity index 100% rename from system/time.nix rename to system/modules/time.nix diff --git a/system/users.nix b/system/modules/users.nix similarity index 100% rename from system/users.nix rename to system/modules/users.nix diff --git a/system/virtualisation.nix b/system/modules/virtualisation.nix similarity index 100% rename from system/virtualisation.nix rename to system/modules/virtualisation.nix diff --git a/system/modules/work.nix b/system/modules/work.nix new file mode 100644 index 0000000..7f45892 --- /dev/null +++ b/system/modules/work.nix @@ -0,0 +1,7 @@ +{ pkgs, ... }: + +{ + environment.systemPackages = with pkgs; [ + + ]; +} diff --git a/system/programming.nix b/system/programming.nix deleted file mode 100644 index 1f34366..0000000 --- a/system/programming.nix +++ /dev/null @@ -1,19 +0,0 @@ -{ pkgs, ... }: - -{ - environment.systemPackages = with pkgs; [ - dotnet-runtime_8 - dotnet-sdk_8 - dotnetPackages.Nuget - gcc - go - lua - nodejs_21 - nodePackages.pnpm - (python3.withPackages (python-pkgs: [ - python-pkgs.pip - python-pkgs.requests - ])) - zig - ]; -} diff --git a/system/work.nix b/system/work.nix deleted file mode 100644 index 2cfa84f..0000000 --- a/system/work.nix +++ /dev/null @@ -1,11 +0,0 @@ -{ pkgs, ... }: - -{ - environment.systemPackages = with pkgs; [ - jetbrains.rider - obsidian - teams-for-linux - thunderbird - zoom-us - ]; -}