From 3acdda283530497438ed930e116291870a277c98 Mon Sep 17 00:00:00 2001 From: Serenity-F Date: Wed, 3 Apr 2024 10:19:53 +1000 Subject: [PATCH 01/80] added auto-upgrade option --- configuration.nix | 12 ++++++------ hosts/proserpina/configuration.nix | 2 +- hosts/proserpina/hardware-configuration.nix | 4 +++- 3 files changed, 10 insertions(+), 8 deletions(-) diff --git a/configuration.nix b/configuration.nix index 3feba2a..4384da3 100755 --- a/configuration.nix +++ b/configuration.nix @@ -26,13 +26,13 @@ "flakes" ]; }; - gc = { - # automatic = true; - # dates = "weekly"; - # options = "--delete-older-than 5d"; - # persistent = true; - }; }; + + system.autoUpgrade = { + enable = true; + channel = "https://nixos.org/channels/nixos-23.11"; + }; + # Bootloader. boot = { # loader = { diff --git a/hosts/proserpina/configuration.nix b/hosts/proserpina/configuration.nix index d86b5d1..3ffaf17 100644 --- a/hosts/proserpina/configuration.nix +++ b/hosts/proserpina/configuration.nix @@ -5,7 +5,7 @@ [ # Include the results of the hardware scan. "${builtins.fetchTarball "https://github.com/nix-community/disko/archive/master.tar.gz"}/module.nix" - ./disko-config.nix + # /disko-config.nix ./hardware-configuration.nix ../../configuration.nix ]; diff --git a/hosts/proserpina/hardware-configuration.nix b/hosts/proserpina/hardware-configuration.nix index 47a61f8..947d0b6 100644 --- a/hosts/proserpina/hardware-configuration.nix +++ b/hosts/proserpina/hardware-configuration.nix @@ -5,7 +5,9 @@ { imports = - [ (modulesPath + "/installer/scan/not-detected.nix") + [ + (modulesPath + "/installer/scan/not-detected.nix") + ./disko-config.sh ]; boot.initrd.availableKernelModules = [ "xhci_pci" "ahci" "usb_storage" "sd_mod" ]; From 978bc4ebadbaf8fc078f0ebfdf052b6949312434 Mon Sep 17 00:00:00 2001 From: Serenity-F Date: Wed, 3 Apr 2024 10:25:30 +1000 Subject: [PATCH 02/80] added block to add /.local to /run/wrappers/bin:/home/serenity/.local/share/flatpak/exports/bin:/var/lib/flatpak/exports/bin:/home/serenity/.nix-profile/bin:/nix/profile/bin:/home/serenity/.local/state/nix/profile/bin:/etc/profiles/per-user/serenity/bin:/nix/var/nix/profiles/default/bin:/run/current-system/sw/bin --- configuration.nix | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/configuration.nix b/configuration.nix index 4384da3..fa168c3 100755 --- a/configuration.nix +++ b/configuration.nix @@ -132,6 +132,15 @@ # media-session.enable = true; }; + environment.variables = { + NIXOS_OZONE_WL = "1"; + NIXPKGS_ALLOW_UNFREE = "1"; + PATH = [ + "\${HOME}/.local/bin" + "\${HOME}/.config/rofi/scripts" + ]; + }; + environment.systemPackages = with pkgs; [ # file system support From 80f43a80e9c893878291f08f21145d51b8218b9d Mon Sep 17 00:00:00 2001 From: Serenity-F Date: Wed, 3 Apr 2024 10:37:27 +1000 Subject: [PATCH 03/80] tidied comments --- configuration.nix | 29 ++--------------------------- 1 file changed, 2 insertions(+), 27 deletions(-) diff --git a/configuration.nix b/configuration.nix index fa168c3..bd5ef20 100755 --- a/configuration.nix +++ b/configuration.nix @@ -109,7 +109,7 @@ # Select internationalisation properties. i18n.defaultLocale = "en_GB.UTF-8"; - # Enable X11 & GNOME + # Enable X11 services.xserver = { enable = true; # displayManager.gdm.enable = true; @@ -181,32 +181,7 @@ moreutils libsecret git-crypt - - # languages - - # - python - # python313 - - # - javascript/typescript - - # - dart/flutter - - # - golang - - # - c/++/# - - # - rust - # rustc - # rustup - # cargo-edit - # cargo-outdated - # cargo-update - # cargo-auditable - # cargo-audit - # cargo-cross - # cargo-bloat - # cargo-msrv - + ]; # Qt dark mode From fd5395f736aa4574de1392433200bbb12f5d5ce3 Mon Sep 17 00:00:00 2001 From: Serenity-F Date: Wed, 3 Apr 2024 11:27:32 +1000 Subject: [PATCH 04/80] renamed 'desktop' -> 'dots', clipped out users loading for now, uhhhh forgor what else --- flake.nix | 2 +- home/{desktop => dots}/default.nix | 0 home/{desktop => dots}/git/default.nix | 0 home/{desktop => dots}/hyprland/default.nix | 0 .../hyprland/environment.nix | 0 home/{desktop => dots}/kitty/default.nix | 0 home/{desktop => dots}/misc/default.nix | 0 home/home.nix | 5 ++--- hosts/proserpina/configuration.nix | 19 +++++++++---------- modules/packages/packages.nix | 7 +++++++ 10 files changed, 19 insertions(+), 14 deletions(-) rename home/{desktop => dots}/default.nix (100%) rename home/{desktop => dots}/git/default.nix (100%) rename home/{desktop => dots}/hyprland/default.nix (100%) rename home/{desktop => dots}/hyprland/environment.nix (100%) rename home/{desktop => dots}/kitty/default.nix (100%) rename home/{desktop => dots}/misc/default.nix (100%) create mode 100644 modules/packages/packages.nix diff --git a/flake.nix b/flake.nix index 107f09a..90393ea 100644 --- a/flake.nix +++ b/flake.nix @@ -12,7 +12,7 @@ nur.url "git:nix-community/NUR"; # nix gaming ? - nix-gaming.url = "github:fufexan/nix-gaming"; + # nix-gaming.url = "github:fufexan/nix-gaming"; # declarative dots home-manager = { diff --git a/home/desktop/default.nix b/home/dots/default.nix similarity index 100% rename from home/desktop/default.nix rename to home/dots/default.nix diff --git a/home/desktop/git/default.nix b/home/dots/git/default.nix similarity index 100% rename from home/desktop/git/default.nix rename to home/dots/git/default.nix diff --git a/home/desktop/hyprland/default.nix b/home/dots/hyprland/default.nix similarity index 100% rename from home/desktop/hyprland/default.nix rename to home/dots/hyprland/default.nix diff --git a/home/desktop/hyprland/environment.nix b/home/dots/hyprland/environment.nix similarity index 100% rename from home/desktop/hyprland/environment.nix rename to home/dots/hyprland/environment.nix diff --git a/home/desktop/kitty/default.nix b/home/dots/kitty/default.nix similarity index 100% rename from home/desktop/kitty/default.nix rename to home/dots/kitty/default.nix diff --git a/home/desktop/misc/default.nix b/home/dots/misc/default.nix similarity index 100% rename from home/desktop/misc/default.nix rename to home/dots/misc/default.nix diff --git a/home/home.nix b/home/home.nix index 8355115..8b2dff6 100755 --- a/home/home.nix +++ b/home/home.nix @@ -3,9 +3,8 @@ { imports = [ - ./users - ./desktop - + # ./users + ./dots ]; programs.home-manager.enable = true; diff --git a/hosts/proserpina/configuration.nix b/hosts/proserpina/configuration.nix index 3ffaf17..2bf3ebb 100644 --- a/hosts/proserpina/configuration.nix +++ b/hosts/proserpina/configuration.nix @@ -1,21 +1,20 @@ { inputs, outputs, config, pkgs, lib, ... }: { - imports = - [ - # Include the results of the hardware scan. - "${builtins.fetchTarball "https://github.com/nix-community/disko/archive/master.tar.gz"}/module.nix" - # /disko-config.nix - ./hardware-configuration.nix - ../../configuration.nix - ]; + imports = [ + # Include the results of the hardware scan. + "${builtins.fetchTarball "https://github.com/nix-community/disko/archive/master.tar.gz"}/module.nix" + ./disko-config.nix + ./hardware-configuration.nix + ../../configuration.nix + ]; # Enable swap on luks boot = { loader = { systemd-boot = { enable = true; - configurationLimit = 5; + configurationLimit = 5; }; efi = { canTouchEfiVariables = true; @@ -75,7 +74,7 @@ }; services = { - + syncthing = { enable = false; dataDir = "/home/serenity/"; diff --git a/modules/packages/packages.nix b/modules/packages/packages.nix new file mode 100644 index 0000000..3198fe7 --- /dev/null +++ b/modules/packages/packages.nix @@ -0,0 +1,7 @@ +{ + + insert.nixcode = { + here = true; + }; + +} From e1e9610683c9f6845148fec4a843d9270b708257 Mon Sep 17 00:00:00 2001 From: Serenity-F Date: Wed, 3 Apr 2024 11:34:42 +1000 Subject: [PATCH 05/80] tweaked some stuff in home/dots --- home/dots/default.nix | 19 +++++++++++-------- 1 file changed, 11 insertions(+), 8 deletions(-) diff --git a/home/dots/default.nix b/home/dots/default.nix index 18e2a45..0f5a6d6 100644 --- a/home/dots/default.nix +++ b/home/dots/default.nix @@ -1,17 +1,20 @@ { imports = [ - ./hyprland - # ./dunst - # ./fish + ./git - ./hyprland + ./fish + ./micro ./kitty - # ./micro - # ./rofi - # ./starship - # ./stylix + ./direnv + ./starship + + ./rofi + ./dunst ./waybar + ./stylix + ./hyprland + ]; } From 6a7cda5ba5ffa99afdf6b5dd45d8a62fc7490229 Mon Sep 17 00:00:00 2001 From: Serenity-F Date: Wed, 3 Apr 2024 11:47:55 +1000 Subject: [PATCH 06/80] forgor --- flake.nix | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/flake.nix b/flake.nix index 90393ea..8038171 100644 --- a/flake.nix +++ b/flake.nix @@ -11,6 +11,9 @@ # nixos user repository ? :o nur.url "git:nix-community/NUR"; + # alejandra ?? think its a code formatter + # alejandra.url = "github:kamadorueda/alejandra/3.0.0"; + # nix gaming ? # nix-gaming.url = "github:fufexan/nix-gaming"; @@ -19,12 +22,14 @@ url = "github:nix-community/home-manager/release-23.11"; inputs.nixpkgs.follows = "nixpkgs"; }; - + # window manager (ricer friendly) hyprland = { url = "github:hyprwm/Hyprland"; inputs.nixpkgs.follows = "nixpkgs"; }; + hyprpicker.url = "github:hyprwm/hyprpicker"; + # hypr-contrib.url = "github:hyprwm/contrib"; }; @@ -49,7 +54,6 @@ { home-manager.useGlobalPkgs = true; home-manager.useUserPackages = true; - # ASK AKESI ABOUT EASIER WAY TO LOAD ALL USERS MAYBE? # home-manager.users.serenity = toplevel; # Optionally, use home-manager.extraSpecialArgs to pass # arguments to home.nix From a905e2dc3d807c5f0f31d00f60795135c4a57b97 Mon Sep 17 00:00:00 2001 From: Serenity-F Date: Wed, 3 Apr 2024 12:00:54 +1000 Subject: [PATCH 07/80] changed structure quite significantly --- home/default.nix | 7 ------- hosts/proserpina/configuration.nix | 2 +- configuration.nix => modules/core/configuration.nix | 0 modules/core/default.nix | 10 ++++++++++ modules/{ => core}/network/default.nix | 0 modules/{ => core}/packages/default.nix | 0 modules/{ => core}/packages/packages.nix | 0 modules/{ => core}/services/default.nix | 0 modules/default.nix | 7 +++---- {home => modules}/home.nix | 2 +- {home/dots => modules/home}/default.nix | 0 {home/dots => modules/home}/git/default.nix | 0 {home/dots => modules/home}/hyprland/default.nix | 0 {home/dots => modules/home}/hyprland/environment.nix | 0 {home/dots => modules/home}/kitty/default.nix | 0 {home/dots => modules/home}/misc/default.nix | 0 {home => modules}/users/default.nix | 0 {home => modules}/users/serenity.nix | 0 18 files changed, 15 insertions(+), 13 deletions(-) delete mode 100644 home/default.nix rename configuration.nix => modules/core/configuration.nix (100%) create mode 100644 modules/core/default.nix rename modules/{ => core}/network/default.nix (100%) rename modules/{ => core}/packages/default.nix (100%) rename modules/{ => core}/packages/packages.nix (100%) rename modules/{ => core}/services/default.nix (100%) rename {home => modules}/home.nix (98%) rename {home/dots => modules/home}/default.nix (100%) rename {home/dots => modules/home}/git/default.nix (100%) rename {home/dots => modules/home}/hyprland/default.nix (100%) rename {home/dots => modules/home}/hyprland/environment.nix (100%) rename {home/dots => modules/home}/kitty/default.nix (100%) rename {home/dots => modules/home}/misc/default.nix (100%) rename {home => modules}/users/default.nix (100%) rename {home => modules}/users/serenity.nix (100%) diff --git a/home/default.nix b/home/default.nix deleted file mode 100644 index 6549b63..0000000 --- a/home/default.nix +++ /dev/null @@ -1,7 +0,0 @@ -{ - - import = [ - ./home.nix - ]; - -} diff --git a/hosts/proserpina/configuration.nix b/hosts/proserpina/configuration.nix index 2bf3ebb..065a776 100644 --- a/hosts/proserpina/configuration.nix +++ b/hosts/proserpina/configuration.nix @@ -6,7 +6,7 @@ "${builtins.fetchTarball "https://github.com/nix-community/disko/archive/master.tar.gz"}/module.nix" ./disko-config.nix ./hardware-configuration.nix - ../../configuration.nix + ../../modules ]; # Enable swap on luks diff --git a/configuration.nix b/modules/core/configuration.nix similarity index 100% rename from configuration.nix rename to modules/core/configuration.nix diff --git a/modules/core/default.nix b/modules/core/default.nix new file mode 100644 index 0000000..36d74a3 --- /dev/null +++ b/modules/core/default.nix @@ -0,0 +1,10 @@ +{ + + imports = [ + ./configuration.nix + ./services + ./packages + ./network + ]; + +} diff --git a/modules/network/default.nix b/modules/core/network/default.nix similarity index 100% rename from modules/network/default.nix rename to modules/core/network/default.nix diff --git a/modules/packages/default.nix b/modules/core/packages/default.nix similarity index 100% rename from modules/packages/default.nix rename to modules/core/packages/default.nix diff --git a/modules/packages/packages.nix b/modules/core/packages/packages.nix similarity index 100% rename from modules/packages/packages.nix rename to modules/core/packages/packages.nix diff --git a/modules/services/default.nix b/modules/core/services/default.nix similarity index 100% rename from modules/services/default.nix rename to modules/core/services/default.nix diff --git a/modules/default.nix b/modules/default.nix index 8c2ea07..82c5eee 100644 --- a/modules/default.nix +++ b/modules/default.nix @@ -1,9 +1,8 @@ { - imports = [ - ./services - ./packages - ./network + import = [ + ./core + ./home.nix ]; } diff --git a/home/home.nix b/modules/home.nix similarity index 98% rename from home/home.nix rename to modules/home.nix index 8b2dff6..3ae52d2 100755 --- a/home/home.nix +++ b/modules/home.nix @@ -4,7 +4,7 @@ imports = [ # ./users - ./dots + ./home ]; programs.home-manager.enable = true; diff --git a/home/dots/default.nix b/modules/home/default.nix similarity index 100% rename from home/dots/default.nix rename to modules/home/default.nix diff --git a/home/dots/git/default.nix b/modules/home/git/default.nix similarity index 100% rename from home/dots/git/default.nix rename to modules/home/git/default.nix diff --git a/home/dots/hyprland/default.nix b/modules/home/hyprland/default.nix similarity index 100% rename from home/dots/hyprland/default.nix rename to modules/home/hyprland/default.nix diff --git a/home/dots/hyprland/environment.nix b/modules/home/hyprland/environment.nix similarity index 100% rename from home/dots/hyprland/environment.nix rename to modules/home/hyprland/environment.nix diff --git a/home/dots/kitty/default.nix b/modules/home/kitty/default.nix similarity index 100% rename from home/dots/kitty/default.nix rename to modules/home/kitty/default.nix diff --git a/home/dots/misc/default.nix b/modules/home/misc/default.nix similarity index 100% rename from home/dots/misc/default.nix rename to modules/home/misc/default.nix diff --git a/home/users/default.nix b/modules/users/default.nix similarity index 100% rename from home/users/default.nix rename to modules/users/default.nix diff --git a/home/users/serenity.nix b/modules/users/serenity.nix similarity index 100% rename from home/users/serenity.nix rename to modules/users/serenity.nix From 6363c7655d12681494bc54dc351a240dc0a06447 Mon Sep 17 00:00:00 2001 From: Serenity-F Date: Thu, 4 Apr 2024 23:04:35 +1000 Subject: [PATCH 08/80] updated flake.nix - moving towards simpler home-manager config --- flake.nix | 17 +++-------- modules/core/configuration.nix | 38 +++++++++++------------ modules/core/display.nix | 34 +++++++++++++++++++++ modules/core/packages/default.nix | 51 +++++++++++++++++++++++++++++-- 4 files changed, 105 insertions(+), 35 deletions(-) create mode 100644 modules/core/display.nix diff --git a/flake.nix b/flake.nix index 8038171..dbf0527 100644 --- a/flake.nix +++ b/flake.nix @@ -1,5 +1,5 @@ { - description = "Serenity's NixOS configuration"; + description = "SerenityOS v0.2.5"; inputs = { @@ -29,7 +29,7 @@ inputs.nixpkgs.follows = "nixpkgs"; }; hyprpicker.url = "github:hyprwm/hyprpicker"; - # hypr-contrib.url = "github:hyprwm/contrib"; + # hypr-contrib.url = "github:hyprwm/contrib"; }; @@ -49,16 +49,6 @@ config.allowUnfree = true; }; }; - home-manager-config = toplevel: [ - home-manager.nixosModules.home-manager # Home manager go brrrr - { - home-manager.useGlobalPkgs = true; - home-manager.useUserPackages = true; - # home-manager.users.serenity = toplevel; - # Optionally, use home-manager.extraSpecialArgs to pass - # arguments to home.nix - } - ]; overlay-flake-pkgs = final: prev: { }; common-modules = [ @@ -73,8 +63,9 @@ modules = [ ./hosts/proserpina/configuration.nix # Load muir main nix config # nixos-hardware.nixosModules.$MODEL - ] ++ home-manager-config (import ./home/home.nix) ++ common-modules; + ] ++ common-modules; }; }; }; + } diff --git a/modules/core/configuration.nix b/modules/core/configuration.nix index bd5ef20..1130fcb 100755 --- a/modules/core/configuration.nix +++ b/modules/core/configuration.nix @@ -6,27 +6,27 @@ ./modules ]; - nixpkgs.config = { - allowUnfree = true; - permittedInsecurePackages = [ - "schildichat-web-1.11.30-sc.2" - "electron-25.9.0" - "nix-2.15.3" - ]; - }; + # nixpkgs.config = { + # allowUnfree = true; + # permittedInsecurePackages = [ + # "schildichat-web-1.11.30-sc.2" + # "electron-25.9.0" + # "nix-2.15.3" + # ]; + # }; # nix options - nix = { - settings = { - cores = 0; - auto-optimise-store = true; - allowed-users = [ "@wheel" ]; - experimental-features = [ - "nix-command" - "flakes" - ]; - }; - }; + # nix = { + # settings = { + # cores = 0; + # auto-optimise-store = true; + # allowed-users = [ "@wheel" ]; + # experimental-features = [ + # "nix-command" + # "flakes" + # ]; + # }; + # }; system.autoUpgrade = { enable = true; diff --git a/modules/core/display.nix b/modules/core/display.nix new file mode 100644 index 0000000..48b955a --- /dev/null +++ b/modules/core/display.nix @@ -0,0 +1,34 @@ +{ inputs, pkgs, username, ... }: + +{ + + programs.hyprland.enable = true; + xdg.portal = { + enable = true; + wlr.enable = true; + xdgOpenUsePortal = true; + extraPortals = [ + pkgs.xdg-desktop-portal-hyprland + pkgs.xdg-desktop-portal-gtk + ]; + }; + + services.xserver = { + enable = true; + xkb.layout = "us"; + displayManager.autoLogin = { + enable = true; + user = "${USERNAME}"; + }; + libinput = { + enable = true; + # mouse = { + # accelProfile = "flat"; + # }; + }; + }; + + # apparently prevents getting stuck at shutdown + systemd.extraConfig = "DefaultTimeoutStopSec=10s"; + +} diff --git a/modules/core/packages/default.nix b/modules/core/packages/default.nix index 429d163..a80467d 100644 --- a/modules/core/packages/default.nix +++ b/modules/core/packages/default.nix @@ -1,7 +1,52 @@ +{ self, pkgs, lib, inputs, ... }: + { - imports = [ - # ./file.nix + import = [ + ./packages.nix ]; - + + nix = { + settings = { + cores = 0; + auto-optimise-store = true; + allowed-users = [ + "@wheel" + ]; + experimental-features = [ + "nix-command" + "flakes" + ]; + }; + # gc = { + # automatic = true; + # }; + }; + + nixpkgs = { + overlays = [ + self.overlays.default + inputs.nur.overlay + ]; + config = { + allowUnfree = true; + permittedInsecurePackages = [ + "schildichat-web-1.11.30-sc.2" + "electron-25.9.0" + # "nix-2.15.3" + ] + }; + }; + + environment.variables = { + NIXOS_OZONE_WL = "1"; + NIXPKGS_ALLOW_UNFREE = "1"; + PATH = [ + "\${HOME}/.local/bin" + "\${HOME}/.config/rofi/scripts" + ]; + }; + + system.stateVersion = "23.11"; + } From 42e573fec541a784325c374e42f53e20becf0d76 Mon Sep 17 00:00:00 2001 From: Serenity-F Date: Thu, 4 Apr 2024 23:40:25 +1000 Subject: [PATCH 09/80] shuffling options around --- modules/core/configuration.nix | 84 +++---------------------------- modules/core/home.nix | 65 ++++++++++++++++++++++++ modules/core/packages/default.nix | 19 ++++++- modules/home.nix | 54 -------------------- modules/users/default.nix | 9 ---- modules/users/serenity.nix | 1 - 6 files changed, 89 insertions(+), 143 deletions(-) create mode 100755 modules/core/home.nix delete mode 100755 modules/home.nix delete mode 100644 modules/users/default.nix delete mode 100644 modules/users/serenity.nix diff --git a/modules/core/configuration.nix b/modules/core/configuration.nix index 1130fcb..0e0bd0f 100755 --- a/modules/core/configuration.nix +++ b/modules/core/configuration.nix @@ -2,74 +2,8 @@ { imports = [ - ./home - ./modules ]; - # nixpkgs.config = { - # allowUnfree = true; - # permittedInsecurePackages = [ - # "schildichat-web-1.11.30-sc.2" - # "electron-25.9.0" - # "nix-2.15.3" - # ]; - # }; - - # nix options - # nix = { - # settings = { - # cores = 0; - # auto-optimise-store = true; - # allowed-users = [ "@wheel" ]; - # experimental-features = [ - # "nix-command" - # "flakes" - # ]; - # }; - # }; - - system.autoUpgrade = { - enable = true; - channel = "https://nixos.org/channels/nixos-23.11"; - }; - - # Bootloader. - boot = { - # loader = { - # systemd-boot.enable = true; - # systemd-boot.configurationLimit = 5; - # efi.canTouchEfiVariables = true; - # }; - # plymouth.enable = true; - initrd = { - # systemd.enable = true; - # secrets = { - # "/crypto_keyfile.bin" = null; - # }; - # kernelParams = [ - # "quiet" - # ]; - # kernel.sysctl = { - # "kernel.sysrq" = 1; - # }; - luks = { - # devices."luks-uuid" = { - # device = "/dev/disk/by-uuid/luks-uuid"; - # }; - }; - }; - }; - - # Run appimages normally - boot.binfmt.registrations.appimage = { - wrapInterpreterInShell = false; - interpreter = "${pkgs.appimage-run}/bin/appimage-run"; - recognitionType = "magic"; - offset = 0; - mask = ''\xff\xff\xff\xff\x00\x00\x00\x00\xff\xff\xff''; - magicOrExtension = ''\x7fELF....AI\x02''; - }; - security = { sudo.execWheelOnly = true; }; @@ -132,14 +66,6 @@ # media-session.enable = true; }; - environment.variables = { - NIXOS_OZONE_WL = "1"; - NIXPKGS_ALLOW_UNFREE = "1"; - PATH = [ - "\${HOME}/.local/bin" - "\${HOME}/.config/rofi/scripts" - ]; - }; environment.systemPackages = with pkgs; [ @@ -220,23 +146,27 @@ flatpak.enable = true; - udev.packages = with pkgs; [ + # udev.packages = with pkgs; [ # yubikey-personalization - ]; + # ]; + locate = { enable = false; package = pkgs.plocate; localuser = null; }; + printing = { enable = false; - # drivers = with pkgs; [ gutenprint hll2390dw-cups ]; + # drivers = with pkgs; [ uwu-driver-cups ]; }; + avahi = { enable = false; nssmdns = false; openFirewall = false; }; + openssh = { enable = false; }; diff --git a/modules/core/home.nix b/modules/core/home.nix new file mode 100755 index 0000000..9457b60 --- /dev/null +++ b/modules/core/home.nix @@ -0,0 +1,65 @@ +{ pkgs, inputs, lib, osConfig, ... }: + +let + packages = with pkgs; [ + fish + ]; +in +{ + imports = [ + inputs.home-manager.nixosModules.home-manager + ]; + home-manager = { + userUserPackages = true; + userGlobalPackages = true; + extraSpecialArgs = { inherit inputs; }; + users.serenity = { + imports = [ (import ./../home) ]; + home.username = "serenity"; + home.homeDirectory = "/home/serenity"; + home.stateVersion = "23.11"; + programs = { + home-manager.enable = true; + direnv = { + enable = true; + nix-direnv.enable = true; + config.load_dotenv = false; + }; + }; + programs.home-manager.enable = true; + }; + }; + + users.users.serenity = { + isNormalUser = true; + description = "Serenity"; + extraGroups = [ + "networkmanager" + "wheel" + ]; + shell = pkgs.fish; + }; + # Copy some files to where they go + # home.file.scripts = { + # source = ./scripts; + # target = ".local/bin/scripts"; + # }; + # Installing muir packages uvu + # home.packages = with pkgs; [ + # - Multimedia + # spotify + # nicotine-plus + # jellyfin-media-player + # gimp + # krita + # inkscape + # obs + # ardour + # - Web & Chat + # fractal + # schildichat-desktop + # - Coding + # vscodium + # gitui + # ]; +} diff --git a/modules/core/packages/default.nix b/modules/core/packages/default.nix index a80467d..443e897 100644 --- a/modules/core/packages/default.nix +++ b/modules/core/packages/default.nix @@ -47,6 +47,21 @@ ]; }; - system.stateVersion = "23.11"; - + boot.binfmt.registrations.appimage = { + wrapInterpreterInShell = false; + interpreter = "${pkgs.appimage-run}/bin/appimage-run"; + recognitionType = "magic"; + offset = 0; + mask = ''\xff\xff\xff\xff\x00\x00\x00\x00\xff\xff\xff'' + magicOrExtension = ''\x7fELF....AI\x02''; + }; + + system = { + stateVersion = "23.11"; + # autoUpgrade = { + # enable = true; + # channel = "INSERT_CHANNEL"; + # }; + }; + } diff --git a/modules/home.nix b/modules/home.nix deleted file mode 100755 index 3ae52d2..0000000 --- a/modules/home.nix +++ /dev/null @@ -1,54 +0,0 @@ -{ pkgs, lib, osConfig, ... }: - -{ - - imports = [ - # ./users - ./home - ]; - - programs.home-manager.enable = true; - - # Copy some files to where they go - # home.file.scripts = { - # source = ./scripts; - # target = ".local/bin/scripts"; - # }; - - # Installing muir packages uvu - home.packages = with pkgs; [ - - # - Multimedia - spotify - # nicotine-plus - # jellyfin-media-player - # gimp - # krita - # inkscape - # obs - # ardour - - # - Web & Chat - # fractal - schildichat-desktop - - # - Coding - # vscodium - # gitui - - ]; - - - # Configure muir programs - - programs = { - direnv = { - enable = true; - nix-direnv.enable = true; - config.load_dotenv = false; - }; - }; - - # don't uh, change this or something might break lol idk - home.stateVersion = "23.11"; -} diff --git a/modules/users/default.nix b/modules/users/default.nix deleted file mode 100644 index d1099f0..0000000 --- a/modules/users/default.nix +++ /dev/null @@ -1,9 +0,0 @@ -{ config, lib, pkgs, osConfig, ...} - -{ - - imports = [ - ./serenity.nix - ]; - -} diff --git a/modules/users/serenity.nix b/modules/users/serenity.nix deleted file mode 100644 index 997b99f..0000000 --- a/modules/users/serenity.nix +++ /dev/null @@ -1 +0,0 @@ -# EMPTY FOR NOW From 6d8cfb873831dc5c5c4eb1b1d68bdc0c57053fa5 Mon Sep 17 00:00:00 2001 From: Serenity-F Date: Thu, 4 Apr 2024 23:49:27 +1000 Subject: [PATCH 10/80] shuffling options around - packages and services this time wei think? --- modules/core/configuration.nix | 32 ------------------------------- modules/core/packages/default.nix | 3 +++ modules/core/services/default.nix | 24 +++++++++++++++++++++++ 3 files changed, 27 insertions(+), 32 deletions(-) diff --git a/modules/core/configuration.nix b/modules/core/configuration.nix index 0e0bd0f..39b4503 100755 --- a/modules/core/configuration.nix +++ b/modules/core/configuration.nix @@ -140,38 +140,6 @@ # Some programs need SUID wrappers, can be configured further or are # started in user sessions. - # List services that you want to enable: - - services = { - - flatpak.enable = true; - - # udev.packages = with pkgs; [ - # yubikey-personalization - # ]; - - locate = { - enable = false; - package = pkgs.plocate; - localuser = null; - }; - - printing = { - enable = false; - # drivers = with pkgs; [ uwu-driver-cups ]; - }; - - avahi = { - enable = false; - nssmdns = false; - openFirewall = false; - }; - - openssh = { - enable = false; - }; - - }; # Set up hardware acceleration # https://nixos.wiki/wiki/Accelerated_Video_Playback diff --git a/modules/core/packages/default.nix b/modules/core/packages/default.nix index 443e897..8d7742a 100644 --- a/modules/core/packages/default.nix +++ b/modules/core/packages/default.nix @@ -6,6 +6,9 @@ ./packages.nix ]; + + services.flatpak.enable = true; + nix = { settings = { cores = 0; diff --git a/modules/core/services/default.nix b/modules/core/services/default.nix index 0662e51..db4a754 100644 --- a/modules/core/services/default.nix +++ b/modules/core/services/default.nix @@ -1,7 +1,31 @@ +{ pkgs, lib, config, ... }: + { imports = [ # file.nix ]; + + + services = { + + openssh = { + enable = false; + }; + avahi = { + enable = false; + nssmdns = false; + openFirewall = false; + }; + + locate = { + enable = false; + package = pkgs.plocate; + localuser = null; + }; + + }; + + } From cbc37a7226ed1105b24b1b3afa9f442fc901818f Mon Sep 17 00:00:00 2001 From: Serenity-F Date: Fri, 5 Apr 2024 00:33:38 +1000 Subject: [PATCH 11/80] fully modularised 'services' and 'networking' subsections of 'configuration.nix' --- hosts/hades/configuration.nix | 103 ------------------ hosts/hades/disko-config.nix | 59 ---------- hosts/hades/hardware-configuration.nix | 26 ----- hosts/proserpina/configuration.nix | 31 +----- hosts/proserpina/hardware-configuration.nix | 3 +- hosts/proserpina/network-configuration.nix | 69 ++++++++++++ modules/core/configuration.nix | 44 ++------ modules/core/default.nix | 10 -- modules/core/network/default.nix | 10 -- .../{services/default.nix => services.nix} | 8 +- 10 files changed, 88 insertions(+), 275 deletions(-) delete mode 100644 hosts/hades/configuration.nix delete mode 100644 hosts/hades/disko-config.nix delete mode 100644 hosts/hades/hardware-configuration.nix create mode 100644 hosts/proserpina/network-configuration.nix delete mode 100644 modules/core/default.nix delete mode 100644 modules/core/network/default.nix rename modules/core/{services/default.nix => services.nix} (63%) diff --git a/hosts/hades/configuration.nix b/hosts/hades/configuration.nix deleted file mode 100644 index 0c6c632..0000000 --- a/hosts/hades/configuration.nix +++ /dev/null @@ -1,103 +0,0 @@ -{ inputs, outputs, config, pkgs, lib, ... }: - -{ - imports = - [ - # Include the results of the hardware scan. - "${builtins.fetchTarball "https://github.com/nix-community/disko/archive/master.tar.gz"}/module.nix" - ./disko-config.nix - ./hardware-configuration.nix - ../../configuration.nix - ]; - - # Enable swap on luks - boot = { - loader = { - systemd-boot = { - enable = true; - configurationLimit = 10; - }; - efi = { - canTouchEfiVariables = true; - # efiSysMountPoint = "/boot/efi"; - }; - }; - initrd = { - systemd.enable = true; - secrets = { - # "crypto_keyfile.bin" = null; - }; - luks = { - # devices."luks-DISK_UUID" = { - # device = "/dev/disk/by-uuid/DISK_UUID"; - # keyfile = "/crypto_keyfile.bin"; - # }; - }; - }; - }; - - services.fstrim.enable = true; - - powerManagement.cpuFreqGovernor = lib.mkDefault "performance"; - - hardware = { - - cpu.intel.updateMicrocode = true; - enableAllFirmware = false; - bluetooth.enable = false; - - opengl = { - enable = true; - extraPackages = with pkgs; [ - intel-compute-runtime - intel-media-driver - vaapiIntel - vaapiVdpau - libvdpau-va-gl - ]; - }; - - }; - - nix = { - # settings = { - # }; - gc = { - automatic = true; - dates = "daily"; - options = "--delete-older-than 7d"; - persistent = true; - }; - }; - - networking = { - hostName = "hades"; # Define your hostname - }; - - services = { - - syncthing = { - enable = false; - dataDir = "/home/serenity/"; - configDir = "/home/serenity/.config/syncthing"; - user = "serenity"; - settings = { - - devices = { - # hades.id = "$DEVICE_ID"; - # hecate.id = "$DEVICE_ID"; - # proserpina.id = "$DEVICE_ID"; - }; - - folders = { - # "$FOLDER_ID" = { - # path = "/home/serenity/Documents/Notes"; - # devices = [ "hecate" "hades" ]; - # }; - - }; - }; - }; - }; - -} diff --git a/hosts/hades/disko-config.nix b/hosts/hades/disko-config.nix deleted file mode 100644 index ecc32ac..0000000 --- a/hosts/hades/disko-config.nix +++ /dev/null @@ -1,59 +0,0 @@ -{ - disko.devices = { - disk = { - sda = { - type = "disk"; - device = "/dev/sda"; - content = { - type = "gpt"; - partitions = { - ESP = { - size = "512M"; - type = "EF00"; - content = { - type = "filesystem"; - format = "vfat"; - mountpoint = "/boot"; - mountOptions = [ - "defaults" - ]; - }; - }; - luks = { - size = "100%"; - content = { - type = "luks"; - name = "pomegranate"; - # disable settings.keyFile if you want to use interactive password entry - #passwordFile = "/tmp/secret.key"; # Interactive - settings = { - allowDiscards = true; - #keyFile = "/tmp/secret.key"; - }; - # additionalKeyFiles = [ "/tmp/additionalSecret.key" ]; - content = { - type = "btrfs"; - extraArgs = [ "-f" ]; - subvolumes = { - "/root" = { - mountpoint = "/"; - mountOptions = [ "compress=zstd" "noatime" ]; - }; - "/home" = { - mountpoint = "/home"; - mountOptions = [ "compress=zstd" "noatime" ]; - }; - "/nix" = { - mountpoint = "/nix"; - mountOptions = [ "compress=zstd" "noatime" ]; - }; - }; - }; - }; - }; - }; - }; - }; - }; - }; -} diff --git a/hosts/hades/hardware-configuration.nix b/hosts/hades/hardware-configuration.nix deleted file mode 100644 index 47a61f8..0000000 --- a/hosts/hades/hardware-configuration.nix +++ /dev/null @@ -1,26 +0,0 @@ -# Do not modify this file! It was generated by ‘nixos-generate-config’ -# and may be overwritten by future invocations. Please make changes -# to /etc/nixos/configuration.nix instead. -{ config, lib, pkgs, modulesPath, ... }: - -{ - imports = - [ (modulesPath + "/installer/scan/not-detected.nix") - ]; - - boot.initrd.availableKernelModules = [ "xhci_pci" "ahci" "usb_storage" "sd_mod" ]; - boot.initrd.kernelModules = [ ]; - boot.kernelModules = [ "kvm-intel" ]; - boot.extraModulePackages = [ ]; - - # Enables DHCP on each ethernet and wireless interface. In case of scripted networking - # (the default) this is the recommended approach. When using systemd-networkd it's - # still possible to use this option, but it's recommended to use it in conjunction - # with explicit per-interface declarations with `networking.interfaces..useDHCP`. - networking.useDHCP = lib.mkDefault true; - # networking.interfaces.enp0s31f6.useDHCP = lib.mkDefault true; - # networking.interfaces.wlp58s0.useDHCP = lib.mkDefault true; - - nixpkgs.hostPlatform = lib.mkDefault "x86_64-linux"; - hardware.cpu.intel.updateMicrocode = lib.mkDefault config.hardware.enableRedistributableFirmware; -} diff --git a/hosts/proserpina/configuration.nix b/hosts/proserpina/configuration.nix index 065a776..691150a 100644 --- a/hosts/proserpina/configuration.nix +++ b/hosts/proserpina/configuration.nix @@ -6,6 +6,7 @@ "${builtins.fetchTarball "https://github.com/nix-community/disko/archive/master.tar.gz"}/module.nix" ./disko-config.nix ./hardware-configuration.nix + ./network-configuration.nix ../../modules ]; @@ -69,34 +70,4 @@ }; }; - networking = { - hostName = "proserpina"; # Define your hostname - }; - - services = { - - syncthing = { - enable = false; - dataDir = "/home/serenity/"; - configDir = "/home/serenity/.config/syncthing"; - user = "serenity"; - settings = { - - devices = { - # hades.id = "$DEVICE_ID"; - # hecate.id = "$DEVICE_ID"; - # proserpina.id = "$DEVICE_ID"; - }; - - folders = { - # "$FOLDER_ID" = { - # path = "/home/serenity/Documents/Notes"; - # devices = [ "hecate" "hades" ]; - # }; - - }; - }; - }; - }; - } diff --git a/hosts/proserpina/hardware-configuration.nix b/hosts/proserpina/hardware-configuration.nix index 947d0b6..1e02223 100644 --- a/hosts/proserpina/hardware-configuration.nix +++ b/hosts/proserpina/hardware-configuration.nix @@ -7,7 +7,8 @@ imports = [ (modulesPath + "/installer/scan/not-detected.nix") - ./disko-config.sh + # ./disko-config.sh + ./disko-config.nix ]; boot.initrd.availableKernelModules = [ "xhci_pci" "ahci" "usb_storage" "sd_mod" ]; diff --git a/hosts/proserpina/network-configuration.nix b/hosts/proserpina/network-configuration.nix new file mode 100644 index 0000000..6d641e2 --- /dev/null +++ b/hosts/proserpina/network-configuration.nix @@ -0,0 +1,69 @@ +{ pkgs, lib, config, ... }: + +{ + + imports = [ + # ./file.nix + ]; + + networking = { + hostname = "proserpina"; + wireless.enable = false; + networkmanager = { + enable = true; + }; + }; + + # networking.proxy = { + # default = "https://user:password@proxy:port/"; + # noProxy = "127.0.0.1, localhost, internal.comain"; + # }; + + networking.firewall = { + enable = false; + # checkReversePath = "loose"; + # allowedTCPPorts = [ 22000 21027 25565 ]; + # allowedUDPPorts = [ 22000 21027 41641 51820 ]; + # allowedTCPPortRanges = [ + # { from = 9999; to = 9999; } # KDE COnnect + # { from = 9999; to = 9999; } # Nicotine+ + # ]; + # allowedUDPPortRanges = [ + # { from = 9999; to = 9999; } # KDE COnnect + # ]; + # interfaces."DEVICENAME".allowedTCPPorts = [ 22999 ] + }; + + services.syncthing = { + enable = false; + dataDir = "/home/serenity/"; + configDir = "/home/serenity/.config/syncthing"; + user = "serenity"; + settings.devices = { + + # hades.id = "DEVICE_ID"; + # proserpina.id = "DEVICE_ID"; + # hecate.id = "DEVICE_ID"; + + }; + settings.folders = { + + # "FOLDER_ID" = { + # path = "/home/serenity/Documents/Notes"; + # devices = [ "hecate" "hades" "proserpina" ]; + # }; + + # "FOLDER_ID" = { + # path = "/home/serenity/Documents/Notes"; + # devices = [ "hecate" "hades" "proserpina" ]; + # }; + + # "FOLDER_ID" = { + # path = "/home/serenity/Documents/Notes"; + # devices = [ "hecate" "hades" "proserpina" ]; + # }; + + }; + }; + +} diff --git a/modules/core/configuration.nix b/modules/core/configuration.nix index 39b4503..c4c3fab 100755 --- a/modules/core/configuration.nix +++ b/modules/core/configuration.nix @@ -2,41 +2,17 @@ { imports = [ + + ./display.nix + ./services.nix + ./packages + ]; security = { sudo.execWheelOnly = true; }; - # Enable networking - networking = { - wireless.enable = false; - networkmanager = { - enable = true; - # insertNameServers = [ - # "10.7.0.1" - # ]; - }; - proxy = { - # default = "https://user:password@proxy:port/"; - # noProxy = "127.0.0.1, localhost,internal.domain"; - }; - firewall = { - enable = false; - # allowedTCPPorts = [ 22000 21027 25565 ]; - # allowedUDPPorts = [ 41641 22000 21027 51820 ]; - # allowedTCPPortRanges = [ - # { from = 1714; to = 1764; } # KDE Connect - # { from = 2234; to = 2239; } # Nicotine+ - # ]; - # allowedUDPPortRanges = [ - # { from = 1714; to = 1764; } # KDE Connect - # ]; - # checkReversePath = "loose"; - # interfaces."tun0".allowedTCPPorts = [ 28996 ]; - }; - }; - # Set your time zone. time.timeZone = "Australia/Brisbane"; @@ -46,8 +22,6 @@ # Enable X11 services.xserver = { enable = true; - # displayManager.gdm.enable = true; - # desktopManager.gnome.enable = true; layout = "us"; xkbVariant = ""; }; @@ -147,10 +121,10 @@ }; # Disable these cuz they cause problems. see: https://github.com/NixOS/nixpkgs/issues/180175 - systemd.services = { - NetworkManager-wait-online.enable = lib.mkForce false; - systemd-networkd-wait-online.enable = lib.mkForce false; - }; + # systemd.services = { + # NetworkManager-wait-online.enable = lib.mkForce false; + # systemd-networkd-wait-online.enable = lib.mkForce false; + # }; # This value determines the NixOS release from which the default # settings for stateful data, like file locations and database versions diff --git a/modules/core/default.nix b/modules/core/default.nix deleted file mode 100644 index 36d74a3..0000000 --- a/modules/core/default.nix +++ /dev/null @@ -1,10 +0,0 @@ -{ - - imports = [ - ./configuration.nix - ./services - ./packages - ./network - ]; - -} diff --git a/modules/core/network/default.nix b/modules/core/network/default.nix deleted file mode 100644 index 532a0d0..0000000 --- a/modules/core/network/default.nix +++ /dev/null @@ -1,10 +0,0 @@ -{ config, lib, pkgs, ... }: - -{ - import = [ - # - ]; - - # INSERT NETWORKING CONFIG HERE - -} diff --git a/modules/core/services/default.nix b/modules/core/services.nix similarity index 63% rename from modules/core/services/default.nix rename to modules/core/services.nix index db4a754..46938a5 100644 --- a/modules/core/services/default.nix +++ b/modules/core/services.nix @@ -3,7 +3,6 @@ { imports = [ - # file.nix ]; @@ -27,5 +26,12 @@ }; + systemd.services = { + networkManager-wait-online.enable = lib.mkForce false; + systemd-networkd-wait-online.enable = lib.mkForce false; + }; + + + system.stateVersion = "23.11"; } From 9179f0e14b51375047bbe9e1910971b8ec3cf88d Mon Sep 17 00:00:00 2001 From: Serenity-F Date: Fri, 5 Apr 2024 00:39:09 +1000 Subject: [PATCH 12/80] fixed structuring somewhat --- hosts/proserpina/configuration.nix | 4 ++-- modules/core/configuration.nix | 5 ++--- modules/default.nix | 8 -------- 3 files changed, 4 insertions(+), 13 deletions(-) delete mode 100644 modules/default.nix diff --git a/hosts/proserpina/configuration.nix b/hosts/proserpina/configuration.nix index 691150a..05d9821 100644 --- a/hosts/proserpina/configuration.nix +++ b/hosts/proserpina/configuration.nix @@ -5,9 +5,9 @@ # Include the results of the hardware scan. "${builtins.fetchTarball "https://github.com/nix-community/disko/archive/master.tar.gz"}/module.nix" ./disko-config.nix - ./hardware-configuration.nix ./network-configuration.nix - ../../modules + ./hardware-configuration.nix + ./../../modules/core/configuration.nix ]; # Enable swap on luks diff --git a/modules/core/configuration.nix b/modules/core/configuration.nix index c4c3fab..59d9e29 100755 --- a/modules/core/configuration.nix +++ b/modules/core/configuration.nix @@ -2,11 +2,10 @@ { imports = [ - - ./display.nix ./services.nix + ./display.nix + ./home.nix ./packages - ]; security = { diff --git a/modules/default.nix b/modules/default.nix deleted file mode 100644 index 82c5eee..0000000 --- a/modules/default.nix +++ /dev/null @@ -1,8 +0,0 @@ -{ - - import = [ - ./core - ./home.nix - ]; - -} From 5f8ef1f6c818296524985ec5665b90ed0d00d9a3 Mon Sep 17 00:00:00 2001 From: Serenity-F Date: Fri, 5 Apr 2024 00:44:04 +1000 Subject: [PATCH 13/80] added structure graph to README.me --- README.md | 41 +++++++++++++++++++++++++++++++++++++++++ 1 file changed, 41 insertions(+) diff --git a/README.md b/README.md index 8547d24..af6812a 100644 --- a/README.md +++ b/README.md @@ -1,5 +1,46 @@ uh so, yeah, wei dunno, wei couldn't even fiure out how to make flakes and home manager and w/e else work with GNOME, so instead wei are jumping into a tiling WM because that will definitely be "easier" ... right ? ... ? +##### Structure: + +``` +├── flake.nix +├── hosts +│ └── proserpina +│ ├── configuration.nix +│ ├── disko-config.nix +│ ├── hardware-configuration.nix +│ └── network-configuration.nix +└── modules + ├── core + │ ├── configuration.nix + │ ├── display.nix + │ ├── home.nix + │ ├── packages + │ │ ├── default.nix + │ │ └── packages.nix + │ └── services.nix + └── home + ├── default.nix + ├── direnv + ├── fish + ├── git + │ └── default.nix + ├── hyprland + │ ├── default.nix + │ └── environment.nix + ├── kitty + │ └── default.nix + ├── micro + ├── misc + │ └── default.nix + ├── resources + │ ├── icons + │ └── wallpapers + ├── starship + ├── stylix + └── waybar +``` + [Hyprland](https://hyprland.org/) From 9315f465ce78a4b7542d3dda5ced2723c22b27b7 Mon Sep 17 00:00:00 2001 From: Serenity-F Date: Fri, 5 Apr 2024 01:01:08 +1000 Subject: [PATCH 14/80] added discrete structure graph --- STRUCTURE.md | 40 ++++++++++++++++++++++++++++++++++++++++ structure.md | 40 ++++++++++++++++++++++++++++++++++++++++ 2 files changed, 80 insertions(+) create mode 100644 STRUCTURE.md create mode 100644 structure.md diff --git a/STRUCTURE.md b/STRUCTURE.md new file mode 100644 index 0000000..0274253 --- /dev/null +++ b/STRUCTURE.md @@ -0,0 +1,40 @@ +. +├── README.md +├── TODO.md +├── STRUCTURE.md +├── flake.nix +├── hosts +│ └── proserpina +│ ├── configuration.nix +│ ├── disko-config.nix +│ ├── hardware-configuration.nix +│ └── network-configuration.nix +└── modules + ├── core + │ ├── configuration.nix + │ ├── display.nix + │ ├── home.nix + │ ├── packages + │ │ ├── default.nix + │ │ └── packages.nix + │ └── services.nix + └── home + ├── default.nix + ├── direnv + ├── fish + ├── git + │ └── default.nix + ├── hyprland + │ ├── default.nix + │ └── environment.nix + ├── kitty + │ └── default.nix + ├── micro + ├── misc + │ └── default.nix + ├── resources + │ ├── icons + │ └── wallpapers + ├── starship + ├── stylix + └── waybar diff --git a/structure.md b/structure.md new file mode 100644 index 0000000..0274253 --- /dev/null +++ b/structure.md @@ -0,0 +1,40 @@ +. +├── README.md +├── TODO.md +├── STRUCTURE.md +├── flake.nix +├── hosts +│ └── proserpina +│ ├── configuration.nix +│ ├── disko-config.nix +│ ├── hardware-configuration.nix +│ └── network-configuration.nix +└── modules + ├── core + │ ├── configuration.nix + │ ├── display.nix + │ ├── home.nix + │ ├── packages + │ │ ├── default.nix + │ │ └── packages.nix + │ └── services.nix + └── home + ├── default.nix + ├── direnv + ├── fish + ├── git + │ └── default.nix + ├── hyprland + │ ├── default.nix + │ └── environment.nix + ├── kitty + │ └── default.nix + ├── micro + ├── misc + │ └── default.nix + ├── resources + │ ├── icons + │ └── wallpapers + ├── starship + ├── stylix + └── waybar From 6bb62477b7305cb726062770777cc70cfeedb0f8 Mon Sep 17 00:00:00 2001 From: Serenity-F Date: Fri, 5 Apr 2024 01:02:28 +1000 Subject: [PATCH 15/80] removed structure graph from README, added link to discrete graph --- README.md | 42 +----------------------------------------- 1 file changed, 1 insertion(+), 41 deletions(-) diff --git a/README.md b/README.md index af6812a..7dc2cd7 100644 --- a/README.md +++ b/README.md @@ -1,46 +1,6 @@ uh so, yeah, wei dunno, wei couldn't even fiure out how to make flakes and home manager and w/e else work with GNOME, so instead wei are jumping into a tiling WM because that will definitely be "easier" ... right ? ... ? -##### Structure: - -``` -├── flake.nix -├── hosts -│ └── proserpina -│ ├── configuration.nix -│ ├── disko-config.nix -│ ├── hardware-configuration.nix -│ └── network-configuration.nix -└── modules - ├── core - │ ├── configuration.nix - │ ├── display.nix - │ ├── home.nix - │ ├── packages - │ │ ├── default.nix - │ │ └── packages.nix - │ └── services.nix - └── home - ├── default.nix - ├── direnv - ├── fish - ├── git - │ └── default.nix - ├── hyprland - │ ├── default.nix - │ └── environment.nix - ├── kitty - │ └── default.nix - ├── micro - ├── misc - │ └── default.nix - ├── resources - │ ├── icons - │ └── wallpapers - ├── starship - ├── stylix - └── waybar -``` - +[Structure](STRUCTURE.md) [Hyprland](https://hyprland.org/) From f2dfbf7703d4b6b92da7af4983b6ec5ea19aeea7 Mon Sep 17 00:00:00 2001 From: Serenity-F Date: Fri, 5 Apr 2024 01:03:32 +1000 Subject: [PATCH 16/80] 'prettified' structure graph --- structure.md | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/structure.md b/structure.md index 0274253..cb63d3e 100644 --- a/structure.md +++ b/structure.md @@ -1,3 +1,8 @@ +### Flake Structure + +--- + +``` . ├── README.md ├── TODO.md @@ -38,3 +43,6 @@ ├── starship ├── stylix └── waybar +``` + +--- From a1e3956fe82a78046aa9e631835577cbc1c28523 Mon Sep 17 00:00:00 2001 From: Serenity-F Date: Fri, 5 Apr 2024 01:05:01 +1000 Subject: [PATCH 17/80] uh, fixed the last commit on aesthetic merit --- README.md | 3 --- 1 file changed, 3 deletions(-) diff --git a/README.md b/README.md index 7dc2cd7..3752b6e 100644 --- a/README.md +++ b/README.md @@ -1,6 +1,3 @@ uh so, yeah, wei dunno, wei couldn't even fiure out how to make flakes and home manager and w/e else work with GNOME, so instead wei are jumping into a tiling WM because that will definitely be "easier" ... right ? ... ? - -[Structure](STRUCTURE.md) - [Hyprland](https://hyprland.org/) From aa3ed551d294381b1f48c80ba4068cf00b24441e Mon Sep 17 00:00:00 2001 From: Serenity-F Date: Fri, 5 Apr 2024 01:06:42 +1000 Subject: [PATCH 18/80] eh what the heck --- README.md | 5 ++++- STRUCTURE.md | 8 ++++++++ structure.md | 48 ------------------------------------------------ 3 files changed, 12 insertions(+), 49 deletions(-) delete mode 100644 structure.md diff --git a/README.md b/README.md index 3752b6e..0e1ac3d 100644 --- a/README.md +++ b/README.md @@ -1,3 +1,6 @@ uh so, yeah, wei dunno, wei couldn't even fiure out how to make flakes and home manager and w/e else work with GNOME, -so instead wei are jumping into a tiling WM because that will definitely be "easier" ... right ? ... ? +so instead wei are jumping into a tiling WM because that will definitely be "easier" ... right ? ... ? + +[Structure](STRUCTURE.md) + [Hyprland](https://hyprland.org/) diff --git a/STRUCTURE.md b/STRUCTURE.md index 0274253..cb63d3e 100644 --- a/STRUCTURE.md +++ b/STRUCTURE.md @@ -1,3 +1,8 @@ +### Flake Structure + +--- + +``` . ├── README.md ├── TODO.md @@ -38,3 +43,6 @@ ├── starship ├── stylix └── waybar +``` + +--- diff --git a/structure.md b/structure.md deleted file mode 100644 index cb63d3e..0000000 --- a/structure.md +++ /dev/null @@ -1,48 +0,0 @@ -### Flake Structure - ---- - -``` -. -├── README.md -├── TODO.md -├── STRUCTURE.md -├── flake.nix -├── hosts -│ └── proserpina -│ ├── configuration.nix -│ ├── disko-config.nix -│ ├── hardware-configuration.nix -│ └── network-configuration.nix -└── modules - ├── core - │ ├── configuration.nix - │ ├── display.nix - │ ├── home.nix - │ ├── packages - │ │ ├── default.nix - │ │ └── packages.nix - │ └── services.nix - └── home - ├── default.nix - ├── direnv - ├── fish - ├── git - │ └── default.nix - ├── hyprland - │ ├── default.nix - │ └── environment.nix - ├── kitty - │ └── default.nix - ├── micro - ├── misc - │ └── default.nix - ├── resources - │ ├── icons - │ └── wallpapers - ├── starship - ├── stylix - └── waybar -``` - ---- From 02e133d48cc5777d81a65902b53b2d0382983898 Mon Sep 17 00:00:00 2001 From: Serenity-F Date: Fri, 5 Apr 2024 02:51:39 +1000 Subject: [PATCH 19/80] hmmmmmmmmmmmmmmmmm massive changes, forgor to commit whoops --- STRUCTURE.md | 35 +-- hosts/proserpina/network-configuration.nix | 3 + modules/core/audio.nix | 17 ++ modules/core/configuration.nix | 117 +------- modules/core/display.nix | 21 +- modules/core/packages/default.nix | 2 + modules/core/packages/packages.nix | 68 ++++- modules/core/services.nix | 13 +- modules/home/default.nix | 15 +- modules/home/hyprland/config.nix | 282 ++++++++++++++++++ modules/home/hyprland/default.nix | 57 +--- modules/home/hyprland/hypr2.nix | 52 ++++ modules/home/hyprland/hyprland.nix | 28 ++ modules/home/hyprland/variables.nix | 28 ++ modules/home/hyprland/waybar/default.nix | 6 + modules/home/hyprland/waybar/settings.nix | 101 +++++++ modules/home/hyprland/waybar/style.nix | 95 ++++++ modules/home/hyprland/waybar/waybar.nix | 9 + modules/home/hyprland/wofi/config/config | 15 + modules/home/hyprland/wofi/config/style.css | 94 ++++++ modules/home/hyprland/wofi/default.nix | 5 + modules/home/misc/default.nix | 13 - modules/home/programs/btop.nix | 14 + modules/home/programs/discord/default.nix | 9 + .../home/programs/discord/theme-template.nix | 15 + modules/home/programs/fish.nix | 7 + modules/home/programs/gaming/gaming.nix | 27 ++ modules/home/programs/gaming/steam.nix | 21 ++ .../{git/default.nix => programs/git.nix} | 5 - modules/home/programs/gtk.nix | 45 +++ .../{kitty/default.nix => programs/kitty.nix} | 42 +-- modules/home/programs/micro.nix | 7 + modules/home/programs/starship.nix | 41 +++ modules/home/programs/vscodium.nix | 100 +++++++ modules/home/scripts/default.nix | 49 +++ modules/home/scripts/scripts/ascii.sh | 45 +++ modules/home/scripts/scripts/compress.sh | 10 + modules/home/scripts/scripts/extract.sh | 6 + modules/home/scripts/scripts/keybinds.sh | 6 + modules/home/scripts/scripts/lofi.sh | 7 + modules/home/scripts/scripts/maxfetch.sh | 53 ++++ modules/home/scripts/scripts/music.sh | 10 + modules/home/scripts/scripts/runbg.sh | 16 + .../home/scripts/scripts/shutdown-script.sh | 15 + modules/home/scripts/scripts/toggle_blur.sh | 7 + .../home/scripts/scripts/toggle_oppacity.sh | 9 + modules/home/scripts/scripts/vm-start.sh | 11 + .../home/scripts/scripts/wallpaper-picker.sh | 12 + 48 files changed, 1410 insertions(+), 255 deletions(-) create mode 100644 modules/core/audio.nix create mode 100644 modules/home/hyprland/config.nix create mode 100644 modules/home/hyprland/hypr2.nix create mode 100644 modules/home/hyprland/hyprland.nix create mode 100644 modules/home/hyprland/variables.nix create mode 100644 modules/home/hyprland/waybar/default.nix create mode 100644 modules/home/hyprland/waybar/settings.nix create mode 100644 modules/home/hyprland/waybar/style.nix create mode 100644 modules/home/hyprland/waybar/waybar.nix create mode 100644 modules/home/hyprland/wofi/config/config create mode 100644 modules/home/hyprland/wofi/config/style.css create mode 100644 modules/home/hyprland/wofi/default.nix delete mode 100644 modules/home/misc/default.nix create mode 100644 modules/home/programs/btop.nix create mode 100644 modules/home/programs/discord/default.nix create mode 100644 modules/home/programs/discord/theme-template.nix create mode 100644 modules/home/programs/fish.nix create mode 100644 modules/home/programs/gaming/gaming.nix create mode 100644 modules/home/programs/gaming/steam.nix rename modules/home/{git/default.nix => programs/git.nix} (79%) create mode 100644 modules/home/programs/gtk.nix rename modules/home/{kitty/default.nix => programs/kitty.nix} (57%) create mode 100644 modules/home/programs/micro.nix create mode 100644 modules/home/programs/starship.nix create mode 100644 modules/home/programs/vscodium.nix create mode 100644 modules/home/scripts/default.nix create mode 100644 modules/home/scripts/scripts/ascii.sh create mode 100755 modules/home/scripts/scripts/compress.sh create mode 100755 modules/home/scripts/scripts/extract.sh create mode 100755 modules/home/scripts/scripts/keybinds.sh create mode 100755 modules/home/scripts/scripts/lofi.sh create mode 100755 modules/home/scripts/scripts/maxfetch.sh create mode 100755 modules/home/scripts/scripts/music.sh create mode 100755 modules/home/scripts/scripts/runbg.sh create mode 100755 modules/home/scripts/scripts/shutdown-script.sh create mode 100755 modules/home/scripts/scripts/toggle_blur.sh create mode 100755 modules/home/scripts/scripts/toggle_oppacity.sh create mode 100755 modules/home/scripts/scripts/vm-start.sh create mode 100755 modules/home/scripts/scripts/wallpaper-picker.sh diff --git a/STRUCTURE.md b/STRUCTURE.md index cb63d3e..64a5335 100644 --- a/STRUCTURE.md +++ b/STRUCTURE.md @@ -4,45 +4,16 @@ ``` . -├── README.md -├── TODO.md -├── STRUCTURE.md ├── flake.nix ├── hosts +│ ├── hades │ └── proserpina -│ ├── configuration.nix -│ ├── disko-config.nix -│ ├── hardware-configuration.nix -│ └── network-configuration.nix └── modules ├── core - │ ├── configuration.nix - │ ├── display.nix - │ ├── home.nix - │ ├── packages - │ │ ├── default.nix - │ │ └── packages.nix - │ └── services.nix └── home - ├── default.nix - ├── direnv - ├── fish - ├── git - │ └── default.nix ├── hyprland - │ ├── default.nix - │ └── environment.nix - ├── kitty - │ └── default.nix - ├── micro - ├── misc - │ └── default.nix + ├── programs ├── resources - │ ├── icons - │ └── wallpapers - ├── starship - ├── stylix - └── waybar + └── scripts ``` - --- diff --git a/hosts/proserpina/network-configuration.nix b/hosts/proserpina/network-configuration.nix index 6d641e2..ded6728 100644 --- a/hosts/proserpina/network-configuration.nix +++ b/hosts/proserpina/network-configuration.nix @@ -12,6 +12,9 @@ networkmanager = { enable = true; }; + # nameservers = [ + # "1.1.1.1" + # ]; }; # networking.proxy = { diff --git a/modules/core/audio.nix b/modules/core/audio.nix new file mode 100644 index 0000000..ba6ed67 --- /dev/null +++ b/modules/core/audio.nix @@ -0,0 +1,17 @@ +{ ... }: + +{ + + sound.enable = true; + hardware.pulseaudio.enable = false; + services.pipewire = { + + enable = true; + jack.enable = true; + pulse.enable = true; + alsa.enable = true; + alsa.support32Bit = true; + lowLatency.enable = true; + }; + +} diff --git a/modules/core/configuration.nix b/modules/core/configuration.nix index 59d9e29..6615776 100755 --- a/modules/core/configuration.nix +++ b/modules/core/configuration.nix @@ -8,123 +8,18 @@ ./packages ]; - security = { - sudo.execWheelOnly = true; - }; - # Set your time zone. + # Timezone & locale time.timeZone = "Australia/Brisbane"; - - # Select internationalisation properties. i18n.defaultLocale = "en_GB.UTF-8"; - # Enable X11 - services.xserver = { - enable = true; - layout = "us"; - xkbVariant = ""; + # security, apparently + security = { + rtkit.enable = true; + sudo.execWheelOnly = true; + pam.services.swaylock = { }; }; - # Enable sound with pipewire. - # sound.enable = true; - hardware.pulseaudio.enable = false; - security.rtkit.enable = true; - services.pipewire = { - enable = true; - alsa.enable = true; - alsa.support32Bit = true; - pulse.enable = true; - jack.enable = true; - # Use the example session manager (this is enabled by default) - # media-session.enable = true; - }; - - - environment.systemPackages = with pkgs; [ - - # file system support - ntfs3g - xfsprogs - - # nixos specific - appimage-run - # home-manager - # nix-output-monitor - # nixpkgs-review - # nix-index - # nix-tree - # nix-init - - # web browsers - firefox - # lagrange - tor-browser-bundle-bin - - # misc/Fonts - (unstable.nerdfonts.override { fonts = ["NerdFontsSymbolsOnly"]; }) - - # terminal stuff - kitty - micro - hyfetch - - # cli utilities - file - zip - unzip - gnupg - busybox - killall - usbutils - pciutils - moreutils - libsecret - git-crypt - - ]; - - # Qt dark mode - # qt.style = "adwaita-dark"; - - # More programs I want - programs = { - # home-manager.enable = true; - # hyprland = { - # enable = true; - # xwayland.enable = true; - # }; - traceroute.enable = true; - corectrl.enable = true; - firefox.enable = true; - htop.enable = true; - git.enable = true; - gnupg.agent = { - enable = true; - enableSSHSupport = false; - }; - fish = { - enable = true; - # import programs/fish.nix pkgs; - }; - - # starship.enable = true; - - }; - - # Some programs need SUID wrappers, can be configured further or are - # started in user sessions. - - # Set up hardware acceleration - # https://nixos.wiki/wiki/Accelerated_Video_Playback - hardware = { - }; - - # Disable these cuz they cause problems. see: https://github.com/NixOS/nixpkgs/issues/180175 - # systemd.services = { - # NetworkManager-wait-online.enable = lib.mkForce false; - # systemd-networkd-wait-online.enable = lib.mkForce false; - # }; - # This value determines the NixOS release from which the default # settings for stateful data, like file locations and database versions # on your system were taken. It‘s perfectly fine and recommended to leave diff --git a/modules/core/display.nix b/modules/core/display.nix index 48b955a..d635a1f 100644 --- a/modules/core/display.nix +++ b/modules/core/display.nix @@ -2,7 +2,11 @@ { - programs.hyprland.enable = true; + programs.hyprland = { + enable = true; + xwayland.enable = true; + }; + xdg.portal = { enable = true; wlr.enable = true; @@ -15,20 +19,27 @@ services.xserver = { enable = true; - xkb.layout = "us"; + layout = "us"; # what is the difference # + xkbVariant = ""; # between + xkb.layout = "us"; # these 2 lolwut # displayManager.autoLogin = { enable = true; user = "${USERNAME}"; }; libinput = { enable = true; - # mouse = { - # accelProfile = "flat"; - # }; + mouse = { + accelProfile = "flat"; + }; }; }; # apparently prevents getting stuck at shutdown systemd.extraConfig = "DefaultTimeoutStopSec=10s"; + # set up hardware video acceleration + # https://nixos.wiki/wiki/Accelerated_Video_Playback + + system.stateVersion = "23.11" + } diff --git a/modules/core/packages/default.nix b/modules/core/packages/default.nix index 8d7742a..fc1b359 100644 --- a/modules/core/packages/default.nix +++ b/modules/core/packages/default.nix @@ -8,6 +8,8 @@ services.flatpak.enable = true; + + qt.style = "adwaita-dark"; nix = { settings = { diff --git a/modules/core/packages/packages.nix b/modules/core/packages/packages.nix index 3198fe7..cb7339a 100644 --- a/modules/core/packages/packages.nix +++ b/modules/core/packages/packages.nix @@ -1,7 +1,69 @@ +{ ... }: + { - insert.nixcode = { - here = true; + environment.systemPackages = with pkgs; [ + + ## web browsers + tor-browser-bundle=bin + # lagrange + firefox + + ## filsesystem support + ntfs3g + xfsprogs + + ## nixos specific + # home-manager + appimage-run + # nix-tree + # nix-init + # nix-index + # nixpkgs-review + # nix-output-monitor + + + ## terminal + kitty + micro + + ## cli tools + hyfetch + file + zip + unzip + gnupg + busybox + killall + usbutils + pciutils + moreutils + libsecret + git-crypt + + ## misc/fonts + (unstable.nerdfonts.override { fonts = ["NerdFontsSymbolsOnly"]; }) + + ## maybe more + + ]; + + + programs = { + # home-manager.enable = true; + traceroute.enable = true; + starship.enable = true; + corectrl.enable = true; + firefox.enable = true; + fish.enable = true; + # htop.enable = true; + git.enable = true; + gnupg.agent = { + enable = false; + enableSSHSupport = false; + }; + }; - + + } diff --git a/modules/core/services.nix b/modules/core/services.nix index 46938a5..15776ad 100644 --- a/modules/core/services.nix +++ b/modules/core/services.nix @@ -7,10 +7,12 @@ services = { + + gvfs.enable = true; + dbus.enable = true; + gnome-keyring.enable = true; - openssh = { - enable = false; - }; + openssh.enable = false avahi = { enable = false; @@ -25,7 +27,10 @@ }; }; - + + + # disable these cuz they cause problems + # see: https://github.com/NixOS/nixpkgs/issues/180175 systemd.services = { networkManager-wait-online.enable = lib.mkForce false; systemd-networkd-wait-online.enable = lib.mkForce false; diff --git a/modules/home/default.nix b/modules/home/default.nix index 0f5a6d6..0c4f419 100644 --- a/modules/home/default.nix +++ b/modules/home/default.nix @@ -1,20 +1,9 @@ { imports = [ - - ./git - ./fish - ./micro - ./kitty - ./direnv - ./starship - - ./rofi - ./dunst - ./waybar - ./stylix + # ./shell + # ./kitty ./hyprland - ]; } diff --git a/modules/home/hyprland/config.nix b/modules/home/hyprland/config.nix new file mode 100644 index 0000000..f01066a --- /dev/null +++ b/modules/home/hyprland/config.nix @@ -0,0 +1,282 @@ +{ ... }: +{ + wayland.windowManager.hyprland = { + extraConfig = " + $mainMod = SUPER + + monitor=,preferred,auto,auto + monitor=,1920x1200,auto,auto + + # autostart + exec-once = systemctl --user import-environment & + exec-once = hash dbus-update-activation-environment 2>/dev/null & + exec-once = dbus-update-activation-environment --systemd & + exec-once = nm-applet & + exec-once = wl-paste --primary --watch wl-copy --primary --clear + exec-once = swaybg -m fill -i $(find ~/Pictures/wallpapers/ -maxdepth 1 -type f) & + exec-once = sleep 1 && swaylock + exec-once = hyprctl setcursor Nordzy-cursors 22 & + exec-once = waybar & + exec-once = mako & + + input { + kb_layout = us + numlock_by_default = true + follow_mouse = 1 + sensitivity = 0 + } + + misc { + disable_autoreload = true + disable_hyprland_logo = true + always_follow_on_dnd = true + layers_hog_keyboard_focus = true + animate_manual_resizes = false + enable_swallow = true + # swallow_regex = + focus_on_activate = true + } + + general { + layout = dwindle + + gaps_in = 0 + gaps_out = 0 + border_size = 2 + col.active_border = rgb(cba6f7) rgb(94e2d5) 45deg + col.inactive_border = 0x00000000 + border_part_of_window = false + no_border_on_floating = false + + # gaps_in = 5 + # gaps_out = 10 + # border_size = 2 + # col.active_border = rgb(cba6f7) rgb(94e2d5) 45deg + # col.inactive_border = 0x00000000 + # border_part_of_window = false + } + + xwayland { + force_zero_scaling = true + } + + dwindle { + no_gaps_when_only = true + force_split = 0 + special_scale_factor = 1.0 + split_width_multiplier = 1.0 + use_active_for_splits = true + pseudotile = yes + preserve_split = yes + } + + master { + new_is_master = true + special_scale_factor = 1 + no_gaps_when_only = false + } + + decoration { + rounding = 5 + # rounding = 12 + + active_opacity = 0.90; + inactive_opacity = 0.90; + fullscreen_opacity = 1.0; + + blur { + enabled = true + + size = 4 + passes = 2 + + brightness = 1 + contrast = 1.300000 + ignore_opacity = true + noise = 0.011700 + + new_optimizations = true + + xray = true + } + + drop_shadow = true; + + shadow_ignore_window = true; + shadow_offset = 0 2 + shadow_range = 20 + shadow_render_power = 3 + col.shadow = rgba(00000055) + } + + + animations { + enabled = true + + bezier = fluent_decel, 0, 0.2, 0.4, 1 + bezier = easeOutCirc, 0, 0.55, 0.45, 1 + bezier = easeOutCubic, 0.33, 1, 0.68, 1 + bezier = easeinoutsine, 0.37, 0, 0.63, 1 + + # Windows + animation = windowsIn, 1, 3, easeOutCubic, popin 30% # window open + animation = windowsOut, 1, 3, fluent_decel, popin 70% # window close. + animation = windowsMove, 1, 2, easeinoutsine, slide # everything in between, moving, dragging, resizing. + + # Fade + animation = fadeIn, 1, 3, easeOutCubic # fade in (open) -> layers and windows + animation = fadeOut, 1, 2, easeOutCubic # fade out (close) -> layers and windows + animation = fadeSwitch, 0, 1, easeOutCirc # fade on changing activewindow and its opacity + animation = fadeShadow, 1, 10, easeOutCirc # fade on changing activewindow for shadows + animation = fadeDim, 1, 4, fluent_decel # the easing of the dimming of inactive windows + animation = border, 1, 2.7, easeOutCirc # for animating the border's color switch speed + animation = borderangle, 1, 30, fluent_decel, once # for animating the border's gradient angle - styles: once (default), loop + animation = workspaces, 1, 4, easeOutCubic, fade # styles: slide, slidevert, fade, slidefade, slidefadevert + } + + + # ---------------------------------------------------------------- + + # show keybinds list + bind = $mainMod, F1, exec, show-keybinds + + # keybindings + bind = $mainMod, Return, exec, kitty + bind = ALT, Return, exec, kitty --title float_kitty + bind = $mainMod SHIFT, Return, exec, kitty --start-as=fullscreen -o 'font_size=16' + bind = $mainMod, B, exec, hyprctl dispatch exec '[workspace 1 silent] floorp' + bind = $mainMod, Q, killactive, + bind = $mainMod, F, fullscreen, 0 + bind = $mainMod SHIFT, F, fullscreen, 1 + bind = $mainMod, Space, togglefloating, + bind = $mainMod, D, exec, pkill wofi || wofi --show drun + bind = $mainMod SHIFT, D, exec, hyprctl dispatch exec '[workspace 4 silent] discord' + bind = $mainMod SHIFT, S, exec, hyprctl dispatch exec '[workspace 5 silent] SoundWireServer' + bind = $mainMod, Escape, exec, swaylock + bind = $mainMod SHIFT, Escape, exec, shutdown-script + bind = $mainMod, P, pseudo, + bind = $mainMod, J, togglesplit, + bind = $mainMod, E, exec, nemo + bind = $mainMod SHIFT, B, exec, pkill -SIGUSR1 .waybar-wrapped + bind = $mainMod, C ,exec, hyprpicker -a + bind = $mainMod, G,exec, $HOME/.local/bin/toggle_layout + bind = $mainMod, W,exec, pkill wofi || wallpaper-picker + bind = $mainMod SHIFT, W, exec, vm-start + + # screenshot + bind = $mainMod, Print, exec, grimblast --notify --cursor save area ~/Pictures/$(date +'%Y-%m-%d-At-%Ih%Mm%Ss').png + bind = ,Print, exec, grimblast --notify --cursor copy area + + # switch focus + bind = $mainMod, left, movefocus, l + bind = $mainMod, right, movefocus, r + bind = $mainMod, up, movefocus, u + bind = $mainMod, down, movefocus, d + + # switch workspace + 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 + + # same as above, but switch to the workspace + bind = $mainMod SHIFT, 1, movetoworkspacesilent, 1 # movetoworkspacesilent + bind = $mainMod SHIFT, 2, movetoworkspacesilent, 2 + bind = $mainMod SHIFT, 3, movetoworkspacesilent, 3 + bind = $mainMod SHIFT, 4, movetoworkspacesilent, 4 + bind = $mainMod SHIFT, 5, movetoworkspacesilent, 5 + bind = $mainMod SHIFT, 6, movetoworkspacesilent, 6 + bind = $mainMod SHIFT, 7, movetoworkspacesilent, 7 + bind = $mainMod SHIFT, 8, movetoworkspacesilent, 8 + bind = $mainMod SHIFT, 9, movetoworkspacesilent, 9 + bind = $mainMod SHIFT, 0, movetoworkspacesilent, 10 + bind = $mainMod CTRL, c, movetoworkspace, empty + + # window control + bind = $mainMod SHIFT, left, movewindow, l + bind = $mainMod SHIFT, right, movewindow, r + bind = $mainMod SHIFT, up, movewindow, u + bind = $mainMod SHIFT, down, movewindow, d + bind = $mainMod CTRL, left, resizeactive, -80 0 + bind = $mainMod CTRL, right, resizeactive, 80 0 + bind = $mainMod CTRL, up, resizeactive, 0 -80 + bind = $mainMod CTRL, down, resizeactive, 0 80 + bind = $mainMod ALT, left, moveactive, -80 0 + bind = $mainMod ALT, right, moveactive, 80 0 + bind = $mainMod ALT, up, moveactive, 0 -80 + bind = $mainMod ALT, down, moveactive, 0 80 + + # media and volume controls + bind = ,XF86AudioRaiseVolume,exec, pamixer -i 2 + bind = ,XF86AudioLowerVolume,exec, pamixer -d 2 + bind = ,XF86AudioMute,exec, pamixer -t + bind = ,XF86AudioPlay,exec, playerctl play-pause + bind = ,XF86AudioNext,exec, playerctl next + bind = ,XF86AudioPrev,exec, playerctl previous + bind = , XF86AudioStop, exec, playerctl stop + bind = $mainMod, mouse_down, workspace, e-1 + bind = $mainMod, mouse_up, workspace, e+1 + + # mouse binding + bindm = $mainMod, mouse:272, movewindow + bindm = $mainMod, mouse:273, resizewindow + + # windowrule + windowrule = float,audacious + windowrule = workspace 8 silent, audacious + windowrule = pin,wofi + windowrule = float,wofi + windowrule = noborder,wofi + windowrule = tile, neovide + windowrule = idleinhibit focus,mpv + windowrule = float,udiskie + windowrule = float,title:^(Transmission)$ + windowrule = float,title:^(Volume Control)$ + windowrule = float,title:^(Firefox — Sharing Indicator)$ + windowrule = move 0 0,title:^(Firefox — Sharing Indicator)$ + windowrule = size 700 450,title:^(Volume Control)$ + windowrule = move 40 55%,title:^(Volume Control)$ + windowrulev2 = float, title:^(Picture-in-Picture)$ + windowrulev2 = opacity 1.0 override 1.0 override, title:^(Picture-in-Picture)$ + # windowrulev2 = opacity 1.0 override 1.0 override, title:^(.*YouTube.*)$ + windowrulev2 = pin, title:^(Picture-in-Picture)$ + windowrule = float,imv + windowrule = center,imv + windowrule = size 1200 725,imv + windowrulev2 = opacity 1.0 override 1.0 override, title:^(.*imv.*)$ + windowrule = float,mpv + windowrule = center,mpv + windowrulev2 = opacity 1.0 override 1.0 override, title:^(.*mpv.*)$ + windowrule = tile,Aseprite + windowrulev2 = opacity 1.0 override 1.0 override, class:(Aseprite) + windowrulev2 = opacity 1.0 override 1.0 override, class:(Unity) + windowrule = size 1200 725,mpv + windowrulev2 = idleinhibit focus, class:^(mpv)$ + windowrulev2 = idleinhibit fullscreen, class:^(firefox)$ + + windowrule = float,title:^(float_kitty)$ + windowrule = center,title:^(float_kitty)$ + windowrule = size 950 600,title:^(float_kitty)$ + + windowrulev2 = float,class:^(pavucontrol)$ + windowrulev2 = float,class:^(SoundWireServer)$ + windowrulev2 = float,class:^(file_progress)$ + windowrulev2 = float,class:^(confirm)$ + windowrulev2 = float,class:^(dialog)$ + windowrulev2 = float,class:^(download)$ + windowrulev2 = float,class:^(notification)$ + windowrulev2 = float,class:^(error)$ + windowrulev2 = float,class:^(confirmreset)$ + windowrulev2 = float,title:^(Open File)$ + windowrulev2 = float,title:^(branchdialog)$ + windowrulev2 = float,title:^(Confirm to replace files)$ + windowrulev2 = float,title:^(File Operation Progress)$ + "; + }; +} diff --git a/modules/home/hyprland/default.nix b/modules/home/hyprland/default.nix index 27ca178..c8e98f1 100644 --- a/modules/home/hyprland/default.nix +++ b/modules/home/hyprland/default.nix @@ -1,52 +1,7 @@ -{ config, lib, pkgs, osConfig, ... } - -{ - - imports = [ - hyprland.homeManagerModules.default - ./hyprland-environment.nix - - ]; - - home = { - packages = with pkgs; [ - waybar - ]; - }; - - programs = { - hyperland = { - enable = true; - xwayland.enable = true; - }; - }; - - wayland.windowManager.hyprland = { - enable = true; - systemdIntegration = true; - settings = { - "$mod" = "SUPER"; - bind = [ - "$mod, F, exec, firefox" - ", Print, exec, grimblast copy area" - ] ++ ( # workspaces - # binds $mod + [shift+] {1..10} to [move to] workspace {1..10} - builtins.concatLists (builtins.genList ( - x: let - ws = let - c = (x + 1) / 10; - in - builtins.toString (x + 1 - (c * 10)); - in [ - "$mod, ${ws}, workspace, ${toString (x + 1)}" - "$mod SHIFT, ${ws}, movetoworkspace, ${toString (x + 1)}" - ] - ) - 10) - ); - }; - }; - - home.stateVersion = "23.11"; - +{ inputs, ... }: +{ + imports = [ (import ./hyprland.nix) ] + ++ [ (import ./config.nix) ] + ++ [ (import ./variables.nix) ] + ++ [ inputs.hyprland.homeManagerModules.default ]; } diff --git a/modules/home/hyprland/hypr2.nix b/modules/home/hyprland/hypr2.nix new file mode 100644 index 0000000..27ca178 --- /dev/null +++ b/modules/home/hyprland/hypr2.nix @@ -0,0 +1,52 @@ +{ config, lib, pkgs, osConfig, ... } + +{ + + imports = [ + hyprland.homeManagerModules.default + ./hyprland-environment.nix + + ]; + + home = { + packages = with pkgs; [ + waybar + ]; + }; + + programs = { + hyperland = { + enable = true; + xwayland.enable = true; + }; + }; + + wayland.windowManager.hyprland = { + enable = true; + systemdIntegration = true; + settings = { + "$mod" = "SUPER"; + bind = [ + "$mod, F, exec, firefox" + ", Print, exec, grimblast copy area" + ] ++ ( # workspaces + # binds $mod + [shift+] {1..10} to [move to] workspace {1..10} + builtins.concatLists (builtins.genList ( + x: let + ws = let + c = (x + 1) / 10; + in + builtins.toString (x + 1 - (c * 10)); + in [ + "$mod, ${ws}, workspace, ${toString (x + 1)}" + "$mod SHIFT, ${ws}, movetoworkspace, ${toString (x + 1)}" + ] + ) + 10) + ); + }; + }; + + home.stateVersion = "23.11"; + +} diff --git a/modules/home/hyprland/hyprland.nix b/modules/home/hyprland/hyprland.nix new file mode 100644 index 0000000..859a7db --- /dev/null +++ b/modules/home/hyprland/hyprland.nix @@ -0,0 +1,28 @@ +{ inputs, pkgs, ...}: +{ + home.packages = with pkgs; [ + # swww + swaybg + inputs.hypr-contrib.packages.${pkgs.system}.grimblast + hyprpicker + wofi + grim + slurp + wl-clipboard + # cliphist + wf-recorder + glib + wayland + direnv + ]; + systemd.user.targets.hyprland-session.Unit.Wants = [ "xdg-desktop-autostart.target" ]; + wayland.windowManager.hyprland = { + enable = true; + xwayland = { + enable = true; + # hidpi = true; + }; + # enableNvidiaPatches = false; + systemd.enable = true; + }; +} diff --git a/modules/home/hyprland/variables.nix b/modules/home/hyprland/variables.nix new file mode 100644 index 0000000..7e530d6 --- /dev/null +++ b/modules/home/hyprland/variables.nix @@ -0,0 +1,28 @@ +{ ... }: +{ + home.sessionVariables = { + NIXOS_OZONE_WL = "1"; + __GL_GSYNC_ALLOWED = "0"; + __GL_VRR_ALLOWED = "0"; + _JAVA_AWT_WM_NONEREPARENTING = "1"; + SSH_AUTH_SOCK = "/run/user/1000/keyring/ssh"; + DISABLE_QT5_COMPAT = "0"; + GDK_BACKEND = "wayland"; + ANKI_WAYLAND = "1"; + DIRENV_LOG_FORMAT = ""; + WLR_DRM_NO_ATOMIC = "1"; + QT_AUTO_SCREEN_SCALE_FACTOR = "1"; + QT_WAYLAND_DISABLE_WINDOWDECORATION = "1"; + QT_QPA_PLATFORM = "xcb"; + QT_QPA_PLATFORMTHEME = "qt5ct"; + QT_STYLE_OVERRIDE = "kvantum"; + MOZ_ENABLE_WAYLAND = "1"; + WLR_BACKEND = "vulkan"; + WLR_RENDERER = "vulkan"; + WLR_NO_HARDWARE_CURSORS = "1"; + XDG_SESSION_TYPE = "wayland"; + SDL_VIDEODRIVER = "wayland"; + CLUTTER_BACKEND = "wayland"; + GTK_THEME = "Catppuccin-Mocha-Compact-Lavender-Dark"; + }; +} diff --git a/modules/home/hyprland/waybar/default.nix b/modules/home/hyprland/waybar/default.nix new file mode 100644 index 0000000..9b8b240 --- /dev/null +++ b/modules/home/hyprland/waybar/default.nix @@ -0,0 +1,6 @@ +{ ... }: +{ + imports = [ (import ./waybar.nix) ] + ++ [ (import ./settings.nix) ] + ++ [ (import ./style.nix) ]; +} diff --git a/modules/home/hyprland/waybar/settings.nix b/modules/home/hyprland/waybar/settings.nix new file mode 100644 index 0000000..1aaeeeb --- /dev/null +++ b/modules/home/hyprland/waybar/settings.nix @@ -0,0 +1,101 @@ +{ ... }: +{ + programs.waybar.settings.mainBar = { + position= "bottom"; + layer= "top"; + height= 5; + margin-top= 0; + margin-bottom= 0; + margin-left= 0; + margin-right= 0; + modules-left= [ + "custom/launcher" + "hyprland/workspaces" + ]; + modules-center= [ + "clock" + ]; + modules-right= [ + "tray" + "cpu" + "memory" + "disk" + "pulseaudio" + "network" + ]; + clock= { + calendar = { + format = { today = "{}"; }; + }; + format = " {:%H:%M}"; + tooltip= "true"; + tooltip-format= "{:%Y %B}\n{calendar}"; + format-alt= " {:%d/%m}"; + }; + "hyprland/workspaces"= { + active-only= false; + disable-scroll= true; + format = "{icon}"; + on-click= "activate"; + format-icons= { + "1"= "󰈹"; + "2"= ""; + "3"= "󰘙"; + "4"= "󰙯"; + "5"= ""; + "6"= ""; + urgent= ""; + default = ""; + sort-by-number= true; + }; + persistent-workspaces = { + "1"= []; + "2"= []; + "3"= []; + "4"= []; + "5"= []; + }; + }; + memory= { + format= "󰟜 {}%"; + format-alt= "󰟜 {used} GiB"; #  + interval= 2; + }; + cpu= { + format= " {usage}%"; + format-alt= " {avg_frequency} GHz"; + interval= 2; + }; + disk = { + # path = "/"; + format = "󰋊 {percentage_used}%"; + interval= 60; + }; + network = { + format-wifi = " {signalStrength}%"; + format-ethernet = "󰀂 "; + tooltip-format = "Connected to {essid} {ifname} via {gwaddr}"; + format-linked = "{ifname} (No IP)"; + format-disconnected = "󰖪 "; + }; + tray= { + icon-size= 20; + spacing= 8; + }; + pulseaudio= { + format= "{icon} {volume}%"; + format-muted= "󰖁 "; + format-icons= { + default= [" "]; + }; + scroll-step= 5; + on-click= "pamixer -t"; + }; + "custom/launcher"= { + format= ""; + on-click= "pkill wofi || wofi --show drun"; + on-click-right= "pkill wofi || wallpaper-picker"; + tooltip= "false"; + }; + }; +} diff --git a/modules/home/hyprland/waybar/style.nix b/modules/home/hyprland/waybar/style.nix new file mode 100644 index 0000000..db32a12 --- /dev/null +++ b/modules/home/hyprland/waybar/style.nix @@ -0,0 +1,95 @@ +{ ... }: +let custom = { + font = "JetBrainsMono Nerd Font"; + font_size = "15px"; + font_weight = "bold"; + text_color = "#cdd6f4"; + secondary_accent= "89b4fa"; + tertiary_accent = "f5f5f5"; + background = "11111B"; + opacity = "0.98"; +}; +in +{ + programs.waybar.style = '' + + * { + border: none; + border-radius: 0px; + padding: 0; + margin: 0; + min-height: 0px; + font-family: ${custom.font}; + font-weight: ${custom.font_weight}; + opacity: ${custom.opacity}; + } + + window#waybar { + background: none; + } + + #workspaces { + font-size: 18px; + padding-left: 15px; + + } + #workspaces button { + color: ${custom.text_color}; + padding-left: 6px; + padding-right: 6px; + } + #workspaces button.empty { + color: #6c7086; + } + #workspaces button.active { + color: #b4befe; + } + + #tray, #pulseaudio, #network, #cpu, #memory, #disk, #clock { + font-size: ${custom.font_size}; + color: ${custom.text_color}; + } + + #cpu { + padding-left: 15px; + padding-right: 9px; + margin-left: 7px; + } + #memory { + padding-left: 9px; + padding-right: 9px; + } + #disk { + padding-left: 9px; + padding-right: 15px; + } + + #tray { + padding: 0 20px; + margin-left: 7px; + } + + #pulseaudio { + padding-left: 15px; + padding-right: 9px; + margin-left: 7px; + } + #network { + padding-left: 9px; + padding-right: 15px; + } + + #clock { + padding-left: 9px; + padding-right: 15px; + } + + #custom-launcher { + font-size: 20px; + color: #b4befe; + font-weight: ${custom.font_weight}; + padding-left: 10px; + padding-right: 15px; + } + ''; +} diff --git a/modules/home/hyprland/waybar/waybar.nix b/modules/home/hyprland/waybar/waybar.nix new file mode 100644 index 0000000..c50e873 --- /dev/null +++ b/modules/home/hyprland/waybar/waybar.nix @@ -0,0 +1,9 @@ +{ pkgs, ... }: +{ + programs.waybar = { + enable = true; + }; + programs.waybar.package = pkgs.waybar.overrideAttrs (oa: { + mesonFlags = (oa.mesonFlags or [ ]) ++ [ "-Dexperimental=true" ]; + }); +} diff --git a/modules/home/hyprland/wofi/config/config b/modules/home/hyprland/wofi/config/config new file mode 100644 index 0000000..4506e27 --- /dev/null +++ b/modules/home/hyprland/wofi/config/config @@ -0,0 +1,15 @@ +width=400 +height=350 +location=center +show=drun +prompt=Search... +filter_rate=100 +allow_markup=true +no_actions=true +halign=fill +orientation=vertical +content_halign=fill +insensitive=true +allow_images=true +image_size=40 +gtk_dark=true diff --git a/modules/home/hyprland/wofi/config/style.css b/modules/home/hyprland/wofi/config/style.css new file mode 100644 index 0000000..a17b2fb --- /dev/null +++ b/modules/home/hyprland/wofi/config/style.css @@ -0,0 +1,94 @@ +/* Mocha Mauve */ +@define-color accent #cba6f7; +@define-color txt #cad3f5; +@define-color bg #24273a; +@define-color bg2 #494d64; + + * { + font-family: 'JetBrains Mono Nerd Font', monospace; + font-size: 14px; + } + + /* Window */ + window { + margin: 0px; + padding: 10px; + border: 3px solid @accent; + border-radius: 7px; + background-color: @bg; + animation: slideIn 0.5s ease-in-out both; + } + + /* Slide In */ + @keyframes slideIn { + 0% { + opacity: 0; + } + + 100% { + opacity: 1; + } + } + + /* Inner Box */ + #inner-box { + margin: 5px; + padding: 10px; + border: none; + background-color: @bg; + animation: fadeIn 0.5s ease-in-out both; + } + + /* Fade In */ + @keyframes fadeIn { + 0% { + opacity: 0; + } + + 100% { + opacity: 1; + } + } + + /* Outer Box */ + #outer-box { + margin: 5px; + padding: 10px; + border: none; + background-color: @bg; + } + + /* Scroll */ + #scroll { + margin: 0px; + padding: 10px; + border: none; + } + + /* Input */ + #input { + margin: 5px; + padding: 10px; + border: none; + color: @accent; + background-color: @bg2; + animation: fadeIn 0.5s ease-in-out both; + } + + /* Text */ + #text { + margin: 5px; + padding: 10px; + border: none; + color: @txt; + animation: fadeIn 0.5s ease-in-out both; + } + + /* Selected Entry */ + #entry:selected { + background-color: @accent; + } + + #entry:selected #text { + color: @bg2; + } \ No newline at end of file diff --git a/modules/home/hyprland/wofi/default.nix b/modules/home/hyprland/wofi/default.nix new file mode 100644 index 0000000..8a341da --- /dev/null +++ b/modules/home/hyprland/wofi/default.nix @@ -0,0 +1,5 @@ +{ ... }: +{ + # https://github.com/prtce/wofi + xdg.configFile."wofi".source = ./config; +} \ No newline at end of file diff --git a/modules/home/misc/default.nix b/modules/home/misc/default.nix deleted file mode 100644 index d98980f..0000000 --- a/modules/home/misc/default.nix +++ /dev/null @@ -1,13 +0,0 @@ -{ pkgs, lib, osConfig, ... }: - -{ - - imports = { - # ./insert - } - - programs = { - # insert misc home programs - }; - -} diff --git a/modules/home/programs/btop.nix b/modules/home/programs/btop.nix new file mode 100644 index 0000000..6d19044 --- /dev/null +++ b/modules/home/programs/btop.nix @@ -0,0 +1,14 @@ +{ pkgs, ... }: +{ + programs.btop = { + enable = true; + + settings = { + color_theme = "dracula"; + theme_background = false; + update_ms = 500; + }; + }; + + home.packages = (with pkgs; [ nvtopPackages.intel ]); +} \ No newline at end of file diff --git a/modules/home/programs/discord/default.nix b/modules/home/programs/discord/default.nix new file mode 100644 index 0000000..f48a6db --- /dev/null +++ b/modules/home/programs/discord/default.nix @@ -0,0 +1,9 @@ +{ pkgs, ... }: +{ + imports = [ (import ./theme-template.nix) ]; + home.packages = with pkgs; [ + (discord.override { + withVencord = true; + }) + ]; +} \ No newline at end of file diff --git a/modules/home/programs/discord/theme-template.nix b/modules/home/programs/discord/theme-template.nix new file mode 100644 index 0000000..616993c --- /dev/null +++ b/modules/home/programs/discord/theme-template.nix @@ -0,0 +1,15 @@ +{ + xdg.configFile."Vencord/themes/custom.css".text = '' + /** + * @name Catppuccin Mocha + * @author winston#0001 + * @authorId 505490445468696576 + * @version 0.2.0 + * @description 🎮 Soothing pastel theme for Discord + * @website https://github.com/catppuccin/discord + * @invite r6Mdz5dpFc + * **/ + + @import url("https://catppuccin.github.io/discord/dist/catppuccin-mocha.theme.css"); + ''; +} \ No newline at end of file diff --git a/modules/home/programs/fish.nix b/modules/home/programs/fish.nix new file mode 100644 index 0000000..db30b33 --- /dev/null +++ b/modules/home/programs/fish.nix @@ -0,0 +1,7 @@ +{ ... }: + +{ + + + +} diff --git a/modules/home/programs/gaming/gaming.nix b/modules/home/programs/gaming/gaming.nix new file mode 100644 index 0000000..f2353cb --- /dev/null +++ b/modules/home/programs/gaming/gaming.nix @@ -0,0 +1,27 @@ +{ pkgs, config, inputs, ... }: +{ + home.packages = with pkgs;[ + ## Utils + gamemode + gamescope + winetricks + inputs.nix-gaming.packages.${pkgs.system}.wine-ge + + ## Cli games + _2048-in-terminal + vitetris + nethack + + ## Celeste + celeste-classic + celeste-classic-pm + + ## Doom + # gzdoom + crispy-doom + + ## Emulation + # cemu + # dolphin-emu + ]; +} diff --git a/modules/home/programs/gaming/steam.nix b/modules/home/programs/gaming/steam.nix new file mode 100644 index 0000000..beaa0a8 --- /dev/null +++ b/modules/home/programs/gaming/steam.nix @@ -0,0 +1,21 @@ +{ pkgs, lib, ... }: +{ + programs.steam = { + enable = true; + remotePlay.openFirewall = true; + dedicatedServer.openFirewall = false; + }; + programs.gamemode.enable = true; + nixpkgs.config.allowUnfreePredicate = pkg: builtins.elem (lib.getName pkg) [ + "steam" + "steam-original" + "steam-runtime" + ]; + # proton-ge-bin + +# warning: The package proton-ge in nix-gaming has been deprecated as of 2024-03-17. + +# You should use proton-ge-bin from Nixpkgs, which conforms to +# the new `extraCompatTools` module option under `programs.steam` +# For details, see the relevant pull request: +} diff --git a/modules/home/git/default.nix b/modules/home/programs/git.nix similarity index 79% rename from modules/home/git/default.nix rename to modules/home/programs/git.nix index 09dec81..e595627 100644 --- a/modules/home/git/default.nix +++ b/modules/home/programs/git.nix @@ -13,9 +13,4 @@ }; }; - home.packages = [ - pkgs.gh - pkgs.git-lfs - ]; - } diff --git a/modules/home/programs/gtk.nix b/modules/home/programs/gtk.nix new file mode 100644 index 0000000..4fee87c --- /dev/null +++ b/modules/home/programs/gtk.nix @@ -0,0 +1,45 @@ +{ pkgs, ... }: +{ + fonts.fontconfig.enable = true; + home.packages = [ + pkgs.nerdfonts + (pkgs.nerdfonts.override { fonts = [ "JetBrainsMono" ]; }) + pkgs.twemoji-color-font + pkgs.noto-fonts-emoji + ]; + + gtk = { + enable = true; + font = { + name = "JetBrainsMono Nerd Font"; + size = 11; + }; + iconTheme = { + name = "Papirus-Dark"; + package = pkgs.catppuccin-papirus-folders.override { + flavor = "mocha"; + accent = "lavender"; + }; + }; + theme = { + name = "Catppuccin-Mocha-Compact-Lavender-Dark"; + package = pkgs.catppuccin-gtk.override { + accents = [ "lavender" ]; + size = "compact"; + # tweaks = [ "rimless" ]; + variant = "mocha"; + }; + }; + cursorTheme = { + name = "Nordzy-cursors"; + package = pkgs.nordzy-cursor-theme; + size = 22; + }; + }; + + home.pointerCursor = { + name = "Nordzy-cursors"; + package = pkgs.nordzy-cursor-theme; + size = 22; + }; +} diff --git a/modules/home/kitty/default.nix b/modules/home/programs/kitty.nix similarity index 57% rename from modules/home/kitty/default.nix rename to modules/home/programs/kitty.nix index bf458aa..e17c3fb 100644 --- a/modules/home/kitty/default.nix +++ b/modules/home/programs/kitty.nix @@ -1,24 +1,24 @@ -{ pkgs, ... }: - +{ pkgs, ... }: { - programs.kitty = { - enable = true; + enable = true; - # theme = "insert-theme" + theme = "Catppuccin-Mocha"; + + font = { + name = "JetBrainsMono Nerd Font"; + size = 13; + }; - # font = { - # name = "insert-font" - # size = 12 - # }; - - settings ={ + settings = { confirm_os_window_close = 0; background_opacity = "0.55"; window_padding_width = 10; scrollback_lines = 10000; enable_audio_bell = false; mouse_hide_wait = 60; + + ## Tabs tab_title_template = "{index}"; active_tab_font_style = "normal"; inactive_tab_font_style = "normal"; @@ -28,12 +28,18 @@ active_tab_background = "#cba6f7"; inactive_tab_foreground = "#bac2de"; inactive_tab_background = "#313244"; - }; + }; - keybindings = { - - }; - + keybindings = { + ## Tabs + "alt+1" = "goto_tab 1"; + "alt+2" = "goto_tab 2"; + "alt+3" = "goto_tab 3"; + "alt+4" = "goto_tab 4"; + + ## Unbind + "ctrl+shift+left" = "no_op"; + "ctrl+shift+right" = "no_op"; + }; }; - -} +} \ No newline at end of file diff --git a/modules/home/programs/micro.nix b/modules/home/programs/micro.nix new file mode 100644 index 0000000..db30b33 --- /dev/null +++ b/modules/home/programs/micro.nix @@ -0,0 +1,7 @@ +{ ... }: + +{ + + + +} diff --git a/modules/home/programs/starship.nix b/modules/home/programs/starship.nix new file mode 100644 index 0000000..0858c08 --- /dev/null +++ b/modules/home/programs/starship.nix @@ -0,0 +1,41 @@ +{ lib, inputs, ... }: +{ + programs.starship = { + enable = true; + + enableBashIntegration = true; + enableZshIntegration = true; + enableNushellIntegration = true; + + settings = { + right_format = "$cmd_duration"; + + directory = { + format = "[ ](bold #89b4fa)[ $path ]($style)"; + style = "bold #b4befe"; + }; + + character = { + success_symbol = "[ ](bold #89b4fa)[ ➜](bold green)"; + error_symbol = "[ ](bold #89b4fa)[ ➜](bold red)"; + # error_symbol = "[ ](bold #89dceb)[ ✗](bold red)"; + }; + + cmd_duration = { + format = "[]($style)[[󰔚 ](bg:#161821 fg:#d4c097 bold)$duration](bg:#161821 fg:#BBC3DF)[ ]($style)"; + disabled = false; + style = "bg:none fg:#161821"; + }; + + # directory.substitutions = { + # "~" = "󰋞"; + # "Documents" = " "; + # "Downloads" = " "; + # "Music" = " "; + # "Pictures" = " "; + # }; + + palette = "catppuccin_mocha"; + } // builtins.fromTOML (builtins.readFile "${inputs.catppuccin-starship}/palettes/mocha.toml"); + }; +} \ No newline at end of file diff --git a/modules/home/programs/vscodium.nix b/modules/home/programs/vscodium.nix new file mode 100644 index 0000000..8c7103d --- /dev/null +++ b/modules/home/programs/vscodium.nix @@ -0,0 +1,100 @@ +{ pkgs, ... }: +{ + programs.vscode = { + enable = true; + package = pkgs.vscodium; + extensions = with pkgs.vscode-extensions; [ + # nix language + bbenoist.nix + # nix-shell suport + arrterian.nix-env-selector + # python + ms-python.python + # C/C++ + ms-vscode.cpptools + # OCaml + ocamllabs.ocaml-platform + + # Color theme + catppuccin.catppuccin-vsc + catppuccin.catppuccin-vsc-icons + ]; + userSettings = { + "update.mode" = "none"; + "extensions.autoUpdate" = false; # This stuff fixes vscode freaking out when theres an update + "window.titleBarStyle" = "custom"; # needed otherwise vscode crashes, see https://github.com/NixOS/nixpkgs/issues/246509 + + "window.menuBarVisibility" = "toggle"; + "editor.fontFamily" = "'JetBrainsMono Nerd Font', 'SymbolsNerdFont', 'monospace', monospace"; + "terminal.integrated.fontFamily" = "'JetBrainsMono Nerd Font', 'SymbolsNerdFont'"; + "editor.fontSize" = 16; + "workbench.colorTheme" = "Catppuccin Mocha"; + "workbench.iconTheme" = "catppuccin-mocha"; + "vsicons.dontShowNewVersionMessage" = true; + "explorer.confirmDragAndDrop" = false; + "editor.fontLigatures" = true; + "editor.minimap.enabled" = false; + "workbench.startupEditor" = "none"; + + "editor.formatOnSave" = true; + "editor.formatOnType" = true; + "editor.formatOnPaste" = true; + + "workbench.layoutControl.type" = "menu"; + "workbench.editor.limit.enabled" = true; + "workbench.editor.limit.value" = 10; + "workbench.editor.limit.perEditorGroup" = true; + "workbench.editor.showTabs" = "single"; + "files.autoSave" = "onWindowChange"; + "explorer.openEditors.visible" = 0; + "breadcrumbs.enabled" = false; + "editor.renderControlCharacters" = false; + "workbench.activityBar.location" = "hidden"; + "workbench.statusBar.visible" = false; + "editor.scrollbar.verticalScrollbarSize" = 2; + "editor.scrollbar.horizontalScrollbarSize" = 2; + "editor.scrollbar.vertical" = "hidden"; + "editor.scrollbar.horizontal" = "hidden"; + "workbench.layoutControl.enabled" = false; + + "editor.mouseWheelZoom" = true; + + "C_Cpp.autocompleteAddParentheses" = true; + "C_Cpp.formatting" = "vcFormat"; + "C_Cpp.vcFormat.newLine.closeBraceSameLine.emptyFunction" = true; + "C_Cpp.vcFormat.newLine.closeBraceSameLine.emptyType" = true; + "C_Cpp.vcFormat.space.beforeEmptySquareBrackets" = true; + "C_Cpp.vcFormat.newLine.beforeOpenBrace.block" = "sameLine"; + "C_Cpp.vcFormat.newLine.beforeOpenBrace.function" = "sameLine"; + "C_Cpp.vcFormat.newLine.beforeElse" = false; + "C_Cpp.vcFormat.newLine.beforeCatch" = false; + "C_Cpp.vcFormat.newLine.beforeOpenBrace.type" = "sameLine"; + "C_Cpp.vcFormat.space.betweenEmptyBraces" = true; + "C_Cpp.vcFormat.space.betweenEmptyLambdaBrackets" = true; + "C_Cpp.vcFormat.indent.caseLabels" = true; + "C_Cpp.intelliSenseCacheSize" = 2048; + "C_Cpp.intelliSenseMemoryLimit" = 2048; + "C_Cpp.default.browse.path" = [ + ''''${workspaceFolder}/**'' + ]; + "C_Cpp.default.cStandard" = "gnu11"; + "C_Cpp.inlayHints.parameterNames.hideLeadingUnderscores" = false; + "C_Cpp.intelliSenseUpdateDelay" = 500; + "C_Cpp.workspaceParsingPriority" = "medium"; + "C_Cpp.clang_format_sortIncludes" = true; + "C_Cpp.doxygen.generatedStyle" = "/**"; + }; + # Keybindings + keybindings = [ + { + key = "ctrl+q"; + command = "editor.action.commentLine"; + when = "editorTextFocus && !editorReadonly"; + } + { + key = "ctrl+s"; + command = "workbench.action.files.saveFiles"; + } + ]; + }; +} diff --git a/modules/home/scripts/default.nix b/modules/home/scripts/default.nix new file mode 100644 index 0000000..90e0adf --- /dev/null +++ b/modules/home/scripts/default.nix @@ -0,0 +1,49 @@ +{pkgs, ...}: let + wall-change = pkgs.writeShellScriptBin "wall-change" ''swaybg -m fill -i $1''; + wallpaper-picker = pkgs.writeShellScriptBin "wallpaper-picker" (builtins.readFile ./scripts/wallpaper-picker.sh); + + runbg = pkgs.writeShellScriptBin "runbg" (builtins.readFile ./scripts/runbg.sh); + music = pkgs.writeShellScriptBin "music" (builtins.readFile ./scripts/music.sh); + lofi = pkgs.writeScriptBin "lofi" (builtins.readFile ./scripts/lofi.sh); + + toggle_blur = pkgs.writeScriptBin "toggle_blur" (builtins.readFile ./scripts/toggle_blur.sh); + toggle_oppacity = pkgs.writeScriptBin "toggle_oppacity" (builtins.readFile ./scripts/toggle_oppacity.sh); + + maxfetch = pkgs.writeScriptBin "maxfetch" (builtins.readFile ./scripts/maxfetch.sh); + + compress = pkgs.writeScriptBin "compress" (builtins.readFile ./scripts/compress.sh); + extract = pkgs.writeScriptBin "extract" (builtins.readFile ./scripts/extract.sh); + + shutdown-script = pkgs.writeScriptBin "shutdown-script" (builtins.readFile ./scripts/shutdown-script.sh); + + show-keybinds = pkgs.writeScriptBin "show-keybinds" (builtins.readFile ./scripts/keybinds.sh); + + vm-start = pkgs.writeScriptBin "vm-start" (builtins.readFile ./scripts/vm-start.sh); + + ascii = pkgs.writeScriptBin "ascii" (builtins.readFile ./scripts/ascii.sh); +in { + home.packages = with pkgs; [ + wall-change + wallpaper-picker + + runbg + music + lofi + + toggle_blur + toggle_oppacity + + maxfetch + + compress + extract + + shutdown-script + + show-keybinds + + vm-start + + ascii + ]; +} diff --git a/modules/home/scripts/scripts/ascii.sh b/modules/home/scripts/scripts/ascii.sh new file mode 100644 index 0000000..0ff7489 --- /dev/null +++ b/modules/home/scripts/scripts/ascii.sh @@ -0,0 +1,45 @@ +#!/usr/bin/env zsh + +RED=$(tput setaf 1) +GREEN=$(tput setaf 2) +BLUE=$(tput setaf 4) +MAGENTA=$(tput setaf 5) +CYAN=$(tput setaf 6) +NORMAL=$(tput sgr0) + +echo -e "┌─────────────┬─────────────┬─────────────┬─────────────┐" +echo -e "│ ${BLUE}Dec${NORMAL} ${GREEN}Hex${NORMAL} Chr │ ${BLUE}Dec${NORMAL} ${GREEN}Hex${NORMAL} Chr │ ${BLUE}Dec${NORMAL} ${GREEN}Hex${NORMAL} Chr │ ${BLUE}Dec${NORMAL} ${GREEN}Hex${NORMAL} Chr │" +echo -e "├─────────────┼─────────────┼─────────────┼─────────────┤" +echo -e "│ 0 0 \033[2mNUL\033[0m\033[0m │ 32 20 │ 64 40 ${CYAN}@${NORMAL} │ 96 60 ${CYAN}\`${NORMAL} │" +echo -e "│ 1 1 \033[2mSOH\033[0m │ 33 21 ${CYAN}!${NORMAL} │ 65 41 ${GREEN}A${NORMAL} │ 97 61 ${GREEN}a${NORMAL} │" +echo -e "│ 2 2 \033[2mSTX\033[0m │ 34 22 ${CYAN}\"${NORMAL} │ 66 42 ${GREEN}B${NORMAL} │ 98 62 ${GREEN}b${NORMAL} │" +echo -e "│ 3 3 \033[2mETX\033[0m │ 35 23 ${CYAN}#${NORMAL} │ 67 43 ${GREEN}C${NORMAL} │ 99 63 ${GREEN}c${NORMAL} │" +echo -e "│ 4 4 \033[2mEOT\033[0m │ 36 24 ${CYAN}\$${NORMAL} │ 68 44 ${GREEN}D${NORMAL} │ 100 64 ${GREEN}d${NORMAL} │" +echo -e "│ 5 5 \033[2mENQ\033[0m │ 37 25 ${CYAN}%${NORMAL} │ 69 45 ${GREEN}E${NORMAL} │ 101 65 ${GREEN}e${NORMAL} │" +echo -e "│ 6 6 \033[2mACK\033[0m │ 38 26 ${CYAN}&${NORMAL} │ 70 46 ${GREEN}F${NORMAL} │ 102 66 ${GREEN}f${NORMAL} │" +echo -e "│ 7 7 \033[2mBEL\033[0m │ 39 27 ${CYAN}'${NORMAL} │ 71 47 ${GREEN}G${NORMAL} │ 103 67 ${GREEN}g${NORMAL} │" +echo -e "│ 8 8 \033[2mBS\033[0m │ 40 28 ${CYAN}(${NORMAL} │ 72 48 ${GREEN}H${NORMAL} │ 104 68 ${GREEN}h${NORMAL} │" +echo -e "│ 9 9 \033[2mHT\033[0m │ 41 29 ${CYAN})${NORMAL} │ 73 49 ${GREEN}I${NORMAL} │ 105 69 ${GREEN}i${NORMAL} │" +echo -e "│ 10 A \033[2mLF\033[0m │ 42 2A ${CYAN}*${NORMAL} │ 74 4A ${GREEN}J${NORMAL} │ 106 6A ${GREEN}j${NORMAL} │" +echo -e "│ 11 B \033[2mVT\033[0m │ 43 2B ${CYAN}+${NORMAL} │ 75 4B ${GREEN}K${NORMAL} │ 107 6B ${GREEN}k${NORMAL} │" +echo -e "│ 12 C \033[2mFF\033[0m │ 44 2C ${CYAN},${NORMAL} │ 76 4C ${GREEN}L${NORMAL} │ 108 6C ${GREEN}l${NORMAL} │" +echo -e "│ 13 D \033[2mCR\033[0m │ 45 2D ${CYAN}-${NORMAL} │ 77 4D ${GREEN}M${NORMAL} │ 109 6D ${GREEN}m${NORMAL} │" +echo -e "│ 14 E \033[2mSO\033[0m │ 46 2E ${CYAN}.${NORMAL} │ 78 4E ${GREEN}N${NORMAL} │ 110 6E ${GREEN}n${NORMAL} │" +echo -e "│ 15 F \033[2mSI\033[0m │ 47 2F ${CYAN}/${NORMAL} │ 79 4F ${GREEN}O${NORMAL} │ 111 6F ${GREEN}o${NORMAL} │" +echo -e "│ 16 10 \033[2mDLE\033[0m │ 48 30 ${RED}0${NORMAL} │ 80 50 ${GREEN}P${NORMAL} │ 112 70 ${GREEN}p${NORMAL} │" +echo -e "│ 17 11 \033[2mDC1\033[0m │ 49 31 ${RED}1${NORMAL} │ 81 51 ${GREEN}Q${NORMAL} │ 113 71 ${GREEN}q${NORMAL} │" +echo -e "│ 18 12 \033[2mDC2\033[0m │ 50 32 ${RED}2${NORMAL} │ 82 52 ${GREEN}R${NORMAL} │ 114 72 ${GREEN}r${NORMAL} │" +echo -e "│ 19 13 \033[2mDC3\033[0m │ 51 33 ${RED}3${NORMAL} │ 83 53 ${GREEN}S${NORMAL} │ 115 73 ${GREEN}s${NORMAL} │" +echo -e "│ 20 14 \033[2mDC4\033[0m │ 52 34 ${RED}4${NORMAL} │ 84 54 ${GREEN}T${NORMAL} │ 116 74 ${GREEN}t${NORMAL} │" +echo -e "│ 21 15 \033[2mNAK\033[0m │ 53 35 ${RED}5${NORMAL} │ 85 55 ${GREEN}U${NORMAL} │ 117 75 ${GREEN}u${NORMAL} │" +echo -e "│ 22 16 \033[2mSYN\033[0m │ 54 36 ${RED}6${NORMAL} │ 86 56 ${GREEN}V${NORMAL} │ 118 76 ${GREEN}v${NORMAL} │" +echo -e "│ 23 17 \033[2mETB\033[0m │ 55 37 ${RED}7${NORMAL} │ 87 57 ${GREEN}W${NORMAL} │ 119 77 ${GREEN}w${NORMAL} │" +echo -e "│ 24 18 \033[2mCAN\033[0m │ 56 38 ${RED}8${NORMAL} │ 88 58 ${GREEN}X${NORMAL} │ 120 78 ${GREEN}x${NORMAL} │" +echo -e "│ 25 19 \033[2mEM\033[0m │ 57 39 ${RED}9${NORMAL} │ 89 59 ${GREEN}Y${NORMAL} │ 121 79 ${GREEN}y${NORMAL} │" +echo -e "│ 26 1A \033[2mSUB\033[0m │ 58 3A ${CYAN}:${NORMAL} │ 90 5A ${GREEN}Z${NORMAL} │ 122 7A ${GREEN}z${NORMAL} │" +echo -e "│ 27 1B \033[2mESC\033[0m │ 59 3B ${CYAN};${NORMAL} │ 91 5B ${CYAN}[${NORMAL} │ 123 7B ${CYAN}{${NORMAL} │" +echo -e "│ 28 1C \033[2mFS\033[0m │ 60 3C ${CYAN}<${NORMAL} │ 92 5C ${CYAN}\\${NORMAL} │ 124 7C ${CYAN}|${NORMAL} │" +echo -e "│ 29 1D \033[2mGS\033[0m │ 61 3D ${CYAN}=${NORMAL} │ 93 5D ${CYAN}]${NORMAL} │ 125 7D ${CYAN}}${NORMAL} │" +echo -e "│ 30 1E \033[2mRS\033[0m │ 62 3E ${CYAN}>${NORMAL} │ 94 5E ${CYAN}^${NORMAL} │ 126 7E ${CYAN}~${NORMAL} │" +echo -e "│ 31 1F \033[2mUS\033[0m │ 63 3F ${CYAN}?${NORMAL} │ 95 5F ${CYAN}_${NORMAL} │ 127 7F \033[2mDEL\033[0m │" +echo -e "└─────────────┴─────────────┴─────────────┴─────────────┘" diff --git a/modules/home/scripts/scripts/compress.sh b/modules/home/scripts/scripts/compress.sh new file mode 100755 index 0000000..5c31e62 --- /dev/null +++ b/modules/home/scripts/scripts/compress.sh @@ -0,0 +1,10 @@ +#!/usr/bin/env bash + +if (( $# == 1 )) then + # echo -ne "Archive name: " + # read name + # tar -cvzf "$name.tar.gz" $1 + tar -cvzf "$1.tar.gz" $1 +else + echo "Wrong number of arguments..." +fi \ No newline at end of file diff --git a/modules/home/scripts/scripts/extract.sh b/modules/home/scripts/scripts/extract.sh new file mode 100755 index 0000000..ecc25dd --- /dev/null +++ b/modules/home/scripts/scripts/extract.sh @@ -0,0 +1,6 @@ +#!/usr/bin/env bash + +for i in "$@" ; do + tar -xvzf $i + break +done diff --git a/modules/home/scripts/scripts/keybinds.sh b/modules/home/scripts/scripts/keybinds.sh new file mode 100755 index 0000000..c1837e1 --- /dev/null +++ b/modules/home/scripts/scripts/keybinds.sh @@ -0,0 +1,6 @@ +#!/usr/bin/env bash + +config_file=~/.config/hypr/hyprland.conf +keybinds=$(grep -oP '(?<=bind = ).*' $config_file) +keybinds=$(echo "$keybinds" | sed 's/,\([^,]*\)$/ = \1/' | sed 's/, exec//g' | sed 's/^,//g') +wofi -dmenu -p "Keybinds" <<< "$keybinds" diff --git a/modules/home/scripts/scripts/lofi.sh b/modules/home/scripts/scripts/lofi.sh new file mode 100755 index 0000000..76cdc8f --- /dev/null +++ b/modules/home/scripts/scripts/lofi.sh @@ -0,0 +1,7 @@ +#!/usr/bin/env bash + +if (ps aux | grep mpv | grep -v grep > /dev/null) then + pkill mpv +else + runbg mpv --no-video https://www.youtube.com/live/jfKfPfyJRdk?si=OF0HKrYFFj33BzMo +fi \ No newline at end of file diff --git a/modules/home/scripts/scripts/maxfetch.sh b/modules/home/scripts/scripts/maxfetch.sh new file mode 100755 index 0000000..486f411 --- /dev/null +++ b/modules/home/scripts/scripts/maxfetch.sh @@ -0,0 +1,53 @@ +#!/usr/bin/env bash + +unicode=" " +version="1.2.0" + +_black=$(tput setaf 0) +red=$(tput setaf 1) +green=$(tput setaf 2) +yellow=$(tput setaf 3) +blue=$(tput setaf 4) +magenta=$(tput setaf 5) +cyan=$(tput setaf 6) +_white=$(tput setaf 7) +_bright=$(tput bold) +normal=$(tput sgr0) +_underline=$(tput smul) + +up=$(uptime | awk -F'( |,|:)+' '{ + d=h=m=0; + if ($7=="min") + m=$6; + else { + if ($7~/^day/) { d=$6; h=$8; m=$9} + else {h=$6;m=$7} + } + } + { print h+0,"h",m+0,"m" } +') +up=$(sed -e "s/ h/h/g" <<< ${up}) +up=$(sed -e "s/ m/m/g" <<< ${up}) + +pkgs=$(nix-store --query --requisites /run/current-system | wc -l) + +fetch() { + echo "${cyan}$(tput bold) _ ___ ____ ____ ${normal}$(tput sgr0)" + echo "${cyan}$(tput bold) / |/ (_)_ __/ __ \/ __/ ${normal}$(tput sgr0)" + echo "${cyan}$(tput bold) / / /\ \ / /_/ /\ \ ${normal}$(tput sgr0)" + echo "${cyan}$(tput bold) /_/|_/_//_\_"'\\'"____/___/ ${normal}$(tput sgr0)" + echo "" + echo " ╭─────────────╮ " + echo " │ ${red} ${normal} user │ ${red}$(whoami)${normal}" + echo " │ ${yellow} ${normal} distro │ ${yellow}$(sed -nE "s@PRETTY_NAME=\"([^\"]*)\"@\1@p" /etc/os-release)${normal} " + echo " │ ${green} ${normal} kernel │ ${green}$(uname -r)${normal} " + echo " │ ${cyan}󱂬 ${normal} de/wm │ ${cyan}$XDG_CURRENT_DESKTOP${normal} " + echo " │ ${blue} ${normal} uptime │ ${blue}${up}${normal} " + echo " │ ${magenta} ${normal} shell │ ${magenta}$(echo ${SHELL##*/})${normal} " + echo " │ ${red}󰏖 ${normal} pkgs │ ${red}${pkgs}${normal} " + echo " ├─────────────┤ " + echo " │ ${_white} ${normal}colors │${_white}$unicode${normal}${red}$unicode${normal}${yellow}$unicode${normal}${green}$unicode${normal}${cyan}$unicode${normal}${blue}$unicode${normal}${magenta}$unicode${normal}${_black}$unicode${normal}" + echo " ╰─────────────╯ " +} + +fetch && exit 0 \ No newline at end of file diff --git a/modules/home/scripts/scripts/music.sh b/modules/home/scripts/scripts/music.sh new file mode 100755 index 0000000..4cebae1 --- /dev/null +++ b/modules/home/scripts/scripts/music.sh @@ -0,0 +1,10 @@ +#!/usr/bin/env bash + +if (ps aux | grep audacious | grep -v grep > /dev/null) then + pkill audacious +else + hyprctl dispatch exec "[workspace 5 silent] audacious -t" + sleep 0.5 + audtool playlist-repeat-status |grep "on" || audtool playlist-repeat-toggle + audtool playlist-shuffle-status|grep "on" || audtool playlist-shuffle-toggle +fi \ No newline at end of file diff --git a/modules/home/scripts/scripts/runbg.sh b/modules/home/scripts/scripts/runbg.sh new file mode 100755 index 0000000..dc5088d --- /dev/null +++ b/modules/home/scripts/scripts/runbg.sh @@ -0,0 +1,16 @@ +#!/usr/bin/env bash + +[ $# -eq 0 ] && { # $# is number of args + echo "$(basename $0): missing command" >&2 + exit 1 +} +prog="$(which "$1")" # see below +[ -z "$prog" ] && { + echo "$(basename $0): unknown command: $1" >&2 + exit 1 +} +shift # remove $1, now $prog, from args +tty -s && exec /dev/null # if stdout is a terminal, redirect to null +tty -s <&2 && exec 2>&1 # stderr to stdout (which might not be null) +"$prog" "$@" & # $@ is all args \ No newline at end of file diff --git a/modules/home/scripts/scripts/shutdown-script.sh b/modules/home/scripts/scripts/shutdown-script.sh new file mode 100755 index 0000000..96aa7ed --- /dev/null +++ b/modules/home/scripts/scripts/shutdown-script.sh @@ -0,0 +1,15 @@ +#!/usr/bin/env zsh + +respond="$(echo "---------------- Yes ----------------\n-------------- Restart --------------\n---------------- Nah ----------------" | wofi --show dmenu -k /dev/null)" + +if [ $respond = '---------------- Yes ----------------' ] +then + echo "shutdown" + shutdown now +elif [ $respond = '-------------- Restart --------------' ] +then + echo "restart" + reboot +else + notify-send "cancel shutdown" +fi diff --git a/modules/home/scripts/scripts/toggle_blur.sh b/modules/home/scripts/scripts/toggle_blur.sh new file mode 100755 index 0000000..9e970a4 --- /dev/null +++ b/modules/home/scripts/scripts/toggle_blur.sh @@ -0,0 +1,7 @@ +#!/usr/bin/env bash + +if hyprctl getoption decoration:blur:enabled | grep "int: 1" >/dev/null ; then + hyprctl keyword decoration:blur:enabled false >/dev/null +else + hyprctl keyword decoration:blur:enabled true >/dev/null +fi diff --git a/modules/home/scripts/scripts/toggle_oppacity.sh b/modules/home/scripts/scripts/toggle_oppacity.sh new file mode 100755 index 0000000..9f1062e --- /dev/null +++ b/modules/home/scripts/scripts/toggle_oppacity.sh @@ -0,0 +1,9 @@ +#!/usr/bin/env bash + +if hyprctl getoption decoration:active_opacity | grep "float: 1" >/dev/null ; then + hyprctl keyword decoration:active_opacity 0.90 >/dev/null + hyprctl keyword decoration:inactive_opacity 0.90 >/dev/null +else + hyprctl keyword decoration:active_opacity 1 >/dev/null + hyprctl keyword decoration:inactive_opacity 1 >/dev/null +fi diff --git a/modules/home/scripts/scripts/vm-start.sh b/modules/home/scripts/scripts/vm-start.sh new file mode 100755 index 0000000..ba2fd15 --- /dev/null +++ b/modules/home/scripts/scripts/vm-start.sh @@ -0,0 +1,11 @@ +#!/usr/bin/env zsh + +# VM name +vm_name="win10" +export LIBVIRT_DEFAULT_URI="qemu:///system" + +# change workspace +hyprctl dispatch workspace 6 + +virsh start ${vm_name} +virt-viewer -f -w -a ${vm_name} \ No newline at end of file diff --git a/modules/home/scripts/scripts/wallpaper-picker.sh b/modules/home/scripts/scripts/wallpaper-picker.sh new file mode 100755 index 0000000..1c2bece --- /dev/null +++ b/modules/home/scripts/scripts/wallpaper-picker.sh @@ -0,0 +1,12 @@ +#!/usr/bin/env bash + +wallpaper_path=$HOME/Pictures/wallpapers +wallpapers_folder=$HOME/Pictures/wallpapers/others +wallpaper_name="$(ls $wallpapers_folder | wofi --show dmenu --sort-order=alphabetical)" +if [[ -f $wallpapers_folder/$wallpaper_name ]]; then + find ~/Pictures/wallpapers -maxdepth 1 -type f -delete + cp $wallpapers_folder/$wallpaper_name $wallpaper_path/$wallpaper_name + wall-change $wallpaper_path/$wallpaper_name +else + exit 1 +fi \ No newline at end of file From 4542d36ba704c9b13b880d46222bc76ba41e2db4 Mon Sep 17 00:00:00 2001 From: Serenity-F Date: Fri, 5 Apr 2024 03:01:07 +1000 Subject: [PATCH 20/80] update TODO.md --- TODO.md | 18 +++++++++++------- 1 file changed, 11 insertions(+), 7 deletions(-) diff --git a/TODO.md b/TODO.md index 56b97d2..3e19ec8 100644 --- a/TODO.md +++ b/TODO.md @@ -1,15 +1,19 @@ --- #### To Do +###### In order of priority --- - - [?] trim down and remove old configuration options for GDM/GNOME - - [?] steal, i mean, uh, look at, other creature's nixos/hyprland setups - - [ ] build ~~minimal~~ system-framework/scaffolding for configuration around hyprland + - [ ] get flake to actually build + - [X] steal, i mean, uh, look at, other creature's nixos/hyprland setups (FrostPhoenix) + - [ ] *fully* convert/swap/cannibalise configs to match needs/wants + - [ ] build *minimal* system-framework/scaffolding for configuration around hyprland (FAILED) + - [X] build *near complete* system-framework/scaffolding for configuration around hyprland - [ ] build user configuration - [ ] optional multi-user support - - [ ] get flake to actually build - - [ ] select media for wallpapers, avatars, etc. - - [ ] uhhh, so much - - [ ] once hades is on nix, have specialised configs for each machine (duh) + - [ ] select media for wallpapers, avatars, etc. + - [ ] per host hardware configurations + - [ ] Hades + - [X] Proserpina + - [ ] add secondary/fallback configuration options for GDM/GNOME From 14c4fcb8c89b442e025dbb4d1ed1678beef12a48 Mon Sep 17 00:00:00 2001 From: Serenity-F Date: Fri, 5 Apr 2024 03:03:32 +1000 Subject: [PATCH 21/80] update TODO.md --- TODO.md | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/TODO.md b/TODO.md index 3e19ec8..445e029 100644 --- a/TODO.md +++ b/TODO.md @@ -1,15 +1,15 @@ --- #### To Do -###### In order of priority + +- In order of priority --- - [ ] get flake to actually build - [X] steal, i mean, uh, look at, other creature's nixos/hyprland setups (FrostPhoenix) - [ ] *fully* convert/swap/cannibalise configs to match needs/wants - - [ ] build *minimal* system-framework/scaffolding for configuration around hyprland (FAILED) - - [X] build *near complete* system-framework/scaffolding for configuration around hyprland + - [ ] build ~~minimal~~ *near complete* system-framework/scaffolding for configuration around hyprland - [ ] build user configuration - [ ] optional multi-user support - [ ] select media for wallpapers, avatars, etc. @@ -17,3 +17,5 @@ - [ ] Hades - [X] Proserpina - [ ] add secondary/fallback configuration options for GDM/GNOME + +--- From 44c76dce8960dbc95af99bd6ce58079a53a39d2d Mon Sep 17 00:00:00 2001 From: Serenity-F Date: Fri, 5 Apr 2024 03:05:06 +1000 Subject: [PATCH 22/80] update TODO.md --- TODO.md | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/TODO.md b/TODO.md index 445e029..54d5cee 100644 --- a/TODO.md +++ b/TODO.md @@ -1,7 +1,8 @@ --- -#### To Do +# To Do +
- In order of priority --- From 8a92c7ac85be4b9f0790782d9b56e9bc4aa54057 Mon Sep 17 00:00:00 2001 From: Serenity-F Date: Fri, 5 Apr 2024 03:54:04 +1000 Subject: [PATCH 23/80] uhm, whoops, forgot --- flake.nix | 2 +- modules/core/packages/packages.nix | 6 ++++ modules/home/hyprland/default.nix | 3 ++ modules/home/hyprland/environment.nix | 20 ----------- modules/home/hyprland/hypr2.nix | 52 --------------------------- modules/home/hyprland/hyprland.nix | 35 ++++++++++++------ modules/home/hyprland/variables.nix | 7 ++++ 7 files changed, 41 insertions(+), 84 deletions(-) delete mode 100644 modules/home/hyprland/environment.nix delete mode 100644 modules/home/hyprland/hypr2.nix diff --git a/flake.nix b/flake.nix index dbf0527..470ebda 100644 --- a/flake.nix +++ b/flake.nix @@ -9,7 +9,7 @@ nixos-hardware.url = "github:NixOS/nixos-hardware/master"; # nixos user repository ? :o - nur.url "git:nix-community/NUR"; + nur.url = "git:nix-community/NUR"; # alejandra ?? think its a code formatter # alejandra.url = "github:kamadorueda/alejandra/3.0.0"; diff --git a/modules/core/packages/packages.nix b/modules/core/packages/packages.nix index cb7339a..300a7b8 100644 --- a/modules/core/packages/packages.nix +++ b/modules/core/packages/packages.nix @@ -10,6 +10,7 @@ firefox ## filsesystem support + udiskie ntfs3g xfsprogs @@ -45,6 +46,11 @@ (unstable.nerdfonts.override { fonts = ["NerdFontsSymbolsOnly"]; }) ## maybe more + + ## libraries + glib + qt5-wayland + qt6-wayland ]; diff --git a/modules/home/hyprland/default.nix b/modules/home/hyprland/default.nix index c8e98f1..d1eb184 100644 --- a/modules/home/hyprland/default.nix +++ b/modules/home/hyprland/default.nix @@ -3,5 +3,8 @@ imports = [ (import ./hyprland.nix) ] ++ [ (import ./config.nix) ] ++ [ (import ./variables.nix) ] + ++ [ (import ./waybar) ] + ++ [ (import ./wofi) ] + # ++ [ (import ./stylix) ] ++ [ inputs.hyprland.homeManagerModules.default ]; } diff --git a/modules/home/hyprland/environment.nix b/modules/home/hyprland/environment.nix deleted file mode 100644 index 710ff45..0000000 --- a/modules/home/hyprland/environment.nix +++ /dev/null @@ -1,20 +0,0 @@ -{ config, pkgs, ... }: - -{ - - home = { - - sessionVariables = { - EDITOR = "micro"; - BROWSER = "firefox"; - TERMINAL = "kitty"; - - XDG_CURRENT_DESKTOP = "Hyprland"; - XDG_SESSION_DESKTOP - "Hyprland"; - XDG_SESSION_TYPE = "wayland"; - - }; - - }; - -} diff --git a/modules/home/hyprland/hypr2.nix b/modules/home/hyprland/hypr2.nix deleted file mode 100644 index 27ca178..0000000 --- a/modules/home/hyprland/hypr2.nix +++ /dev/null @@ -1,52 +0,0 @@ -{ config, lib, pkgs, osConfig, ... } - -{ - - imports = [ - hyprland.homeManagerModules.default - ./hyprland-environment.nix - - ]; - - home = { - packages = with pkgs; [ - waybar - ]; - }; - - programs = { - hyperland = { - enable = true; - xwayland.enable = true; - }; - }; - - wayland.windowManager.hyprland = { - enable = true; - systemdIntegration = true; - settings = { - "$mod" = "SUPER"; - bind = [ - "$mod, F, exec, firefox" - ", Print, exec, grimblast copy area" - ] ++ ( # workspaces - # binds $mod + [shift+] {1..10} to [move to] workspace {1..10} - builtins.concatLists (builtins.genList ( - x: let - ws = let - c = (x + 1) / 10; - in - builtins.toString (x + 1 - (c * 10)); - in [ - "$mod, ${ws}, workspace, ${toString (x + 1)}" - "$mod SHIFT, ${ws}, movetoworkspace, ${toString (x + 1)}" - ] - ) - 10) - ); - }; - }; - - home.stateVersion = "23.11"; - -} diff --git a/modules/home/hyprland/hyprland.nix b/modules/home/hyprland/hyprland.nix index 859a7db..f46b48f 100644 --- a/modules/home/hyprland/hyprland.nix +++ b/modules/home/hyprland/hyprland.nix @@ -1,28 +1,41 @@ -{ inputs, pkgs, ...}: +{ inputs, pkgs, ...}: + { + home.packages = with pkgs; [ - # swww - swaybg + wayland + inputs.hypr-contrib.packages.${pkgs.system}.grimblast + + hyprlock + hyprpaper hyprpicker + hyprcursor + wofi grim + dunst slurp - wl-clipboard - # cliphist + nm-applet + overskride + cliphist + wl-clip-persist wf-recorder - glib - wayland - direnv + ]; - systemd.user.targets.hyprland-session.Unit.Wants = [ "xdg-desktop-autostart.target" ]; + + systemd.user.targets.hyprland-session.Unit.Wants = [ + "xdg-desktop-autostart.target" + ]; + wayland.windowManager.hyprland = { + enable = true; + systemd.enable = true; xwayland = { enable = true; # hidpi = true; }; - # enableNvidiaPatches = false; - systemd.enable = true; }; + } diff --git a/modules/home/hyprland/variables.nix b/modules/home/hyprland/variables.nix index 7e530d6..884624e 100644 --- a/modules/home/hyprland/variables.nix +++ b/modules/home/hyprland/variables.nix @@ -1,6 +1,11 @@ { ... }: + { home.sessionVariables = { + + TERMINAL = "kitty"; + EDITOR = "micro"; + BROWSER = "firefox"; NIXOS_OZONE_WL = "1"; __GL_GSYNC_ALLOWED = "0"; __GL_VRR_ALLOWED = "0"; @@ -20,6 +25,8 @@ WLR_BACKEND = "vulkan"; WLR_RENDERER = "vulkan"; WLR_NO_HARDWARE_CURSORS = "1"; + XDG_CURRENT_DESKTOP = "hyprland"; + XDG_SESSION_DESKTOP = "hyprland"; XDG_SESSION_TYPE = "wayland"; SDL_VIDEODRIVER = "wayland"; CLUTTER_BACKEND = "wayland"; From a59580400736f4dff19398636f1e45ac0c9c1ab5 Mon Sep 17 00:00:00 2001 From: Serenity-F Date: Fri, 5 Apr 2024 03:56:36 +1000 Subject: [PATCH 24/80] fixed typo --- flake.nix | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/flake.nix b/flake.nix index 470ebda..f05a752 100644 --- a/flake.nix +++ b/flake.nix @@ -28,8 +28,9 @@ url = "github:hyprwm/Hyprland"; inputs.nixpkgs.follows = "nixpkgs"; }; + hyprpicker.url = "github:hyprwm/hyprpicker"; - # hypr-contrib.url = "github:hyprwm/contrib"; + # hypr-contrib.url = "github:hyprwm/contrib"; }; @@ -39,7 +40,7 @@ nixpkgs-unstable, nixos-hardware, home-manager, - hyprland,, + hyprland, ... }: let system = "x86_64-linux"; From 48736cc79a82d9c0df2093192e659e087aacb65c Mon Sep 17 00:00:00 2001 From: Serenity-F Date: Fri, 5 Apr 2024 04:00:55 +1000 Subject: [PATCH 25/80] removed nur for now --- flake.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/flake.nix b/flake.nix index f05a752..5008078 100644 --- a/flake.nix +++ b/flake.nix @@ -9,7 +9,7 @@ nixos-hardware.url = "github:NixOS/nixos-hardware/master"; # nixos user repository ? :o - nur.url = "git:nix-community/NUR"; + # nur.url = "git:nix-community/NUR"; # alejandra ?? think its a code formatter # alejandra.url = "github:kamadorueda/alejandra/3.0.0"; From 401b286ecdd73bb51f56db3c91ab275f35e33cda Mon Sep 17 00:00:00 2001 From: Serenity-F Date: Fri, 5 Apr 2024 04:02:05 +1000 Subject: [PATCH 26/80] fixed typo --- flake.lock | 324 ++++++++++++++++++++++++++++++++++++++ modules/core/services.nix | 2 +- 2 files changed, 325 insertions(+), 1 deletion(-) create mode 100644 flake.lock diff --git a/flake.lock b/flake.lock new file mode 100644 index 0000000..fcf199c --- /dev/null +++ b/flake.lock @@ -0,0 +1,324 @@ +{ + "nodes": { + "home-manager": { + "inputs": { + "nixpkgs": [ + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1710888565, + "narHash": "sha256-s9Hi4RHhc6yut4EcYD50sZWRDKsugBJHSbON8KFwoTw=", + "owner": "nix-community", + "repo": "home-manager", + "rev": "f33900124c23c4eca5831b9b5eb32ea5894375ce", + "type": "github" + }, + "original": { + "owner": "nix-community", + "ref": "release-23.11", + "repo": "home-manager", + "type": "github" + } + }, + "hyprcursor": { + "inputs": { + "hyprlang": "hyprlang", + "nixpkgs": [ + "hyprland", + "nixpkgs" + ], + "systems": [ + "hyprland", + "systems" + ] + }, + "locked": { + "lastModified": 1711466786, + "narHash": "sha256-sArxGyUBiCA1in+q6t0QqT+ZJiZ1PyBp7cNPKLmREM0=", + "owner": "hyprwm", + "repo": "hyprcursor", + "rev": "d3876f34779cc03ee51e4aafc0d00a4f187c7544", + "type": "github" + }, + "original": { + "owner": "hyprwm", + "repo": "hyprcursor", + "type": "github" + } + }, + "hyprland": { + "inputs": { + "hyprcursor": "hyprcursor", + "hyprland-protocols": "hyprland-protocols", + "hyprlang": "hyprlang_2", + "nixpkgs": [ + "nixpkgs" + ], + "systems": "systems_2", + "wlroots": "wlroots", + "xdph": "xdph" + }, + "locked": { + "lastModified": 1712253037, + "narHash": "sha256-9Ej7MCILxOTzXcznI3mt7avKzbv9nKQXru2DLrSlK2E=", + "owner": "hyprwm", + "repo": "Hyprland", + "rev": "0569b9c30099be32f5e0d3b56a050059b9e5a8c1", + "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" + } + }, + "hyprlang": { + "inputs": { + "nixpkgs": [ + "hyprland", + "hyprcursor", + "nixpkgs" + ], + "systems": "systems" + }, + "locked": { + "lastModified": 1709914708, + "narHash": "sha256-bR4o3mynoTa1Wi4ZTjbnsZ6iqVcPGriXp56bZh5UFTk=", + "owner": "hyprwm", + "repo": "hyprlang", + "rev": "a685493fdbeec01ca8ccdf1f3655c044a8ce2fe2", + "type": "github" + }, + "original": { + "owner": "hyprwm", + "repo": "hyprlang", + "type": "github" + } + }, + "hyprlang_2": { + "inputs": { + "nixpkgs": [ + "hyprland", + "nixpkgs" + ], + "systems": [ + "hyprland", + "systems" + ] + }, + "locked": { + "lastModified": 1711250455, + "narHash": "sha256-LSq1ZsTpeD7xsqvlsepDEelWRDtAhqwetp6PusHXJRo=", + "owner": "hyprwm", + "repo": "hyprlang", + "rev": "b3e430f81f3364c5dd1a3cc9995706a4799eb3fa", + "type": "github" + }, + "original": { + "owner": "hyprwm", + "repo": "hyprlang", + "type": "github" + } + }, + "hyprpicker": { + "inputs": { + "nixpkgs": "nixpkgs" + }, + "locked": { + "lastModified": 1711283076, + "narHash": "sha256-Cda+XbHpvyz3HhdJ7FlXFoaazOWtdBoOWmEaj4ZFwRM=", + "owner": "hyprwm", + "repo": "hyprpicker", + "rev": "0eb49192a5cdd5e6e8e6c2c82c33857d78d6cd56", + "type": "github" + }, + "original": { + "owner": "hyprwm", + "repo": "hyprpicker", + "type": "github" + } + }, + "nixos-hardware": { + "locked": { + "lastModified": 1711352745, + "narHash": "sha256-luvqik+i3HTvCbXQZgB6uggvEcxI9uae0nmrgtXJ17U=", + "owner": "NixOS", + "repo": "nixos-hardware", + "rev": "9a763a7acc4cfbb8603bb0231fec3eda864f81c0", + "type": "github" + }, + "original": { + "owner": "NixOS", + "ref": "master", + "repo": "nixos-hardware", + "type": "github" + } + }, + "nixpkgs": { + "locked": { + "lastModified": 1683014792, + "narHash": "sha256-6Va9iVtmmsw4raBc3QKvQT2KT/NGRWlvUlJj46zN8B8=", + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "1a411f23ba299db155a5b45d5e145b85a7aafc42", + "type": "github" + }, + "original": { + "owner": "NixOS", + "ref": "nixos-unstable", + "repo": "nixpkgs", + "type": "github" + } + }, + "nixpkgs-unstable": { + "locked": { + "lastModified": 1712163089, + "narHash": "sha256-Um+8kTIrC19vD4/lUCN9/cU9kcOsD1O1m+axJqQPyMM=", + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "fd281bd6b7d3e32ddfa399853946f782553163b5", + "type": "github" + }, + "original": { + "id": "nixpkgs", + "ref": "nixos-unstable", + "type": "indirect" + } + }, + "nixpkgs_2": { + "locked": { + "lastModified": 1712168706, + "narHash": "sha256-XP24tOobf6GGElMd0ux90FEBalUtw6NkBSVh/RlA6ik=", + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "1487bdea619e4a7a53a4590c475deabb5a9d1bfb", + "type": "github" + }, + "original": { + "id": "nixpkgs", + "ref": "nixos-23.11", + "type": "indirect" + } + }, + "root": { + "inputs": { + "home-manager": "home-manager", + "hyprland": "hyprland", + "hyprpicker": "hyprpicker", + "nixos-hardware": "nixos-hardware", + "nixpkgs": "nixpkgs_2", + "nixpkgs-unstable": "nixpkgs-unstable" + } + }, + "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": 1689347949, + "narHash": "sha256-12tWmuL2zgBgZkdoB6qXZsgJEH9LR3oUgpaQq2RbI80=", + "owner": "nix-systems", + "repo": "default-linux", + "rev": "31732fcf5e8fea42e59c2488ad31a0e651500f68", + "type": "github" + }, + "original": { + "owner": "nix-systems", + "repo": "default-linux", + "type": "github" + } + }, + "wlroots": { + "flake": false, + "locked": { + "host": "gitlab.freedesktop.org", + "lastModified": 1709983277, + "narHash": "sha256-wXWIJLd4F2JZeMaihWVDW/yYXCLEC8OpeNJZg9a9ly8=", + "owner": "wlroots", + "repo": "wlroots", + "rev": "50eae512d9cecbf0b3b1898bb1f0b40fa05fe19b", + "type": "gitlab" + }, + "original": { + "host": "gitlab.freedesktop.org", + "owner": "wlroots", + "repo": "wlroots", + "rev": "50eae512d9cecbf0b3b1898bb1f0b40fa05fe19b", + "type": "gitlab" + } + }, + "xdph": { + "inputs": { + "hyprland-protocols": [ + "hyprland", + "hyprland-protocols" + ], + "hyprlang": [ + "hyprland", + "hyprlang" + ], + "nixpkgs": [ + "hyprland", + "nixpkgs" + ], + "systems": [ + "hyprland", + "systems" + ] + }, + "locked": { + "lastModified": 1709299639, + "narHash": "sha256-jYqJM5khksLIbqSxCLUUcqEgI+O2LdlSlcMEBs39CAU=", + "owner": "hyprwm", + "repo": "xdg-desktop-portal-hyprland", + "rev": "2d2fb547178ec025da643db57d40a971507b82fe", + "type": "github" + }, + "original": { + "owner": "hyprwm", + "repo": "xdg-desktop-portal-hyprland", + "type": "github" + } + } + }, + "root": "root", + "version": 7 +} diff --git a/modules/core/services.nix b/modules/core/services.nix index 15776ad..246d3f9 100644 --- a/modules/core/services.nix +++ b/modules/core/services.nix @@ -12,7 +12,7 @@ dbus.enable = true; gnome-keyring.enable = true; - openssh.enable = false + openssh.enable = false; avahi = { enable = false; From d13f020a68cdaa916200c6d2c41a55be7b17cf1c Mon Sep 17 00:00:00 2001 From: Serenity-F Date: Fri, 5 Apr 2024 04:02:58 +1000 Subject: [PATCH 27/80] fixed typo --- modules/core/display.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/core/display.nix b/modules/core/display.nix index d635a1f..aec65a0 100644 --- a/modules/core/display.nix +++ b/modules/core/display.nix @@ -40,6 +40,6 @@ # set up hardware video acceleration # https://nixos.wiki/wiki/Accelerated_Video_Playback - system.stateVersion = "23.11" + system.stateVersion = "23.11"; } From 45e5b95765cc337c52678a42a3d952b4bad2afa3 Mon Sep 17 00:00:00 2001 From: Serenity-F Date: Fri, 5 Apr 2024 04:04:45 +1000 Subject: [PATCH 28/80] fixed typo --- modules/core/display.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/core/display.nix b/modules/core/display.nix index aec65a0..6683344 100644 --- a/modules/core/display.nix +++ b/modules/core/display.nix @@ -24,7 +24,7 @@ xkb.layout = "us"; # these 2 lolwut # displayManager.autoLogin = { enable = true; - user = "${USERNAME}"; + user = "serenity"; }; libinput = { enable = true; From 2a30496811299235ff7b8f59f7500242bef057a8 Mon Sep 17 00:00:00 2001 From: Serenity-F Date: Fri, 5 Apr 2024 04:05:59 +1000 Subject: [PATCH 29/80] fixed typo - home manager already enabled apparently --- modules/core/home.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/core/home.nix b/modules/core/home.nix index 9457b60..d3f034a 100755 --- a/modules/core/home.nix +++ b/modules/core/home.nix @@ -26,7 +26,7 @@ in config.load_dotenv = false; }; }; - programs.home-manager.enable = true; + # programs.home-manager.enable = true; }; }; From 121767d3c59c0c6146c206cf79d7e36b7d79a15f Mon Sep 17 00:00:00 2001 From: Serenity-F Date: Fri, 5 Apr 2024 04:12:05 +1000 Subject: [PATCH 30/80] ?? --- modules/home/default.nix | 3 +-- modules/home/programs/default.nix | 14 ++++++++++++++ 2 files changed, 15 insertions(+), 2 deletions(-) create mode 100644 modules/home/programs/default.nix diff --git a/modules/home/default.nix b/modules/home/default.nix index 0c4f419..e4080ab 100644 --- a/modules/home/default.nix +++ b/modules/home/default.nix @@ -1,8 +1,7 @@ { imports = [ - # ./shell - # ./kitty + ./programs ./hyprland ]; diff --git a/modules/home/programs/default.nix b/modules/home/programs/default.nix new file mode 100644 index 0000000..4315cdd --- /dev/null +++ b/modules/home/programs/default.nix @@ -0,0 +1,14 @@ +{ + + imports = [ + ./git.nix + ./gtk.nix + ./btop.nix + ./fish.nix + ./kitty.nix + ./micro.nix + ./starship.nix + ./vscodium.nix + ] + +} From f0626e0005474b24baf708f8515da1a870b5b565 Mon Sep 17 00:00:00 2001 From: Serenity-F Date: Fri, 5 Apr 2024 04:14:03 +1000 Subject: [PATCH 31/80] ?? --- modules/core/home.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/core/home.nix b/modules/core/home.nix index d3f034a..47877bf 100755 --- a/modules/core/home.nix +++ b/modules/core/home.nix @@ -12,7 +12,7 @@ in home-manager = { userUserPackages = true; userGlobalPackages = true; - extraSpecialArgs = { inherit inputs; }; + # extraSpecialArgs = { inherit inputs; }; users.serenity = { imports = [ (import ./../home) ]; home.username = "serenity"; From f22c90111fc4e7e15801ce5e416837940f83556c Mon Sep 17 00:00:00 2001 From: Serenity-F Date: Fri, 5 Apr 2024 04:15:55 +1000 Subject: [PATCH 32/80] ????? --- modules/core/home.nix | 5 ----- 1 file changed, 5 deletions(-) diff --git a/modules/core/home.nix b/modules/core/home.nix index 47877bf..ed2b3a7 100755 --- a/modules/core/home.nix +++ b/modules/core/home.nix @@ -1,10 +1,5 @@ { pkgs, inputs, lib, osConfig, ... }: -let - packages = with pkgs; [ - fish - ]; -in { imports = [ inputs.home-manager.nixosModules.home-manager From 72d743e36457a8b98e535e74b5e96aa344f94b3f Mon Sep 17 00:00:00 2001 From: Serenity-F Date: Fri, 5 Apr 2024 04:17:13 +1000 Subject: [PATCH 33/80] ? ? ? --- modules/core/home.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/modules/core/home.nix b/modules/core/home.nix index ed2b3a7..77af0f8 100755 --- a/modules/core/home.nix +++ b/modules/core/home.nix @@ -1,4 +1,4 @@ -{ pkgs, inputs, lib, osConfig, ... }: +{ pkgs, inputs, osConfig, ... }: { imports = [ @@ -7,7 +7,7 @@ home-manager = { userUserPackages = true; userGlobalPackages = true; - # extraSpecialArgs = { inherit inputs; }; + extraSpecialArgs = { inherit inputs; }; users.serenity = { imports = [ (import ./../home) ]; home.username = "serenity"; From 7b05cc8bb4dd575397072461ae45c2ff00440b8e Mon Sep 17 00:00:00 2001 From: Serenity-F Date: Fri, 5 Apr 2024 04:18:32 +1000 Subject: [PATCH 34/80] ? ? ? --- modules/core/home.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/core/home.nix b/modules/core/home.nix index 77af0f8..2e80a13 100755 --- a/modules/core/home.nix +++ b/modules/core/home.nix @@ -2,7 +2,7 @@ { imports = [ - inputs.home-manager.nixosModules.home-manager + # inputs.home-manager.nixosModules.home-manager ]; home-manager = { userUserPackages = true; From 8b9114065ecbb022367ae8963c57aa55260f378b Mon Sep 17 00:00:00 2001 From: Serenity-F Date: Fri, 5 Apr 2024 04:19:21 +1000 Subject: [PATCH 35/80] dropped a semi colon lol --- modules/core/packages/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/core/packages/default.nix b/modules/core/packages/default.nix index fc1b359..711a1b6 100644 --- a/modules/core/packages/default.nix +++ b/modules/core/packages/default.nix @@ -39,7 +39,7 @@ "schildichat-web-1.11.30-sc.2" "electron-25.9.0" # "nix-2.15.3" - ] + ]; }; }; From ca63f67189ce139df8cc652693020635c3764212 Mon Sep 17 00:00:00 2001 From: Serenity-F Date: Fri, 5 Apr 2024 04:19:57 +1000 Subject: [PATCH 36/80] dropped a semi colon lol --- modules/core/packages/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/core/packages/default.nix b/modules/core/packages/default.nix index 711a1b6..0720478 100644 --- a/modules/core/packages/default.nix +++ b/modules/core/packages/default.nix @@ -57,7 +57,7 @@ interpreter = "${pkgs.appimage-run}/bin/appimage-run"; recognitionType = "magic"; offset = 0; - mask = ''\xff\xff\xff\xff\x00\x00\x00\x00\xff\xff\xff'' + mask = ''\xff\xff\xff\xff\x00\x00\x00\x00\xff\xff\xff''; magicOrExtension = ''\x7fELF....AI\x02''; }; From 3fef383967c2c6d94909ebd010c113dfa144f1eb Mon Sep 17 00:00:00 2001 From: Serenity-F Date: Fri, 5 Apr 2024 04:21:14 +1000 Subject: [PATCH 37/80] commented unused options --- modules/core/packages/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/modules/core/packages/default.nix b/modules/core/packages/default.nix index 0720478..f6df04b 100644 --- a/modules/core/packages/default.nix +++ b/modules/core/packages/default.nix @@ -30,8 +30,8 @@ nixpkgs = { overlays = [ - self.overlays.default - inputs.nur.overlay + # self.overlays.default + # inputs.nur.overlay ]; config = { allowUnfree = true; From ed1406bc0fcdc88cad6b8435e23b593124c99cb0 Mon Sep 17 00:00:00 2001 From: Serenity-F Date: Fri, 5 Apr 2024 04:22:50 +1000 Subject: [PATCH 38/80] ? --- modules/core/home.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/core/home.nix b/modules/core/home.nix index 2e80a13..3bfa97f 100755 --- a/modules/core/home.nix +++ b/modules/core/home.nix @@ -7,7 +7,7 @@ home-manager = { userUserPackages = true; userGlobalPackages = true; - extraSpecialArgs = { inherit inputs; }; + # extraSpecialArgs = { inherit inputs; }; users.serenity = { imports = [ (import ./../home) ]; home.username = "serenity"; From cba64536aa7699ed039eb42625bbd79d6614ea75 Mon Sep 17 00:00:00 2001 From: Serenity-F Date: Fri, 5 Apr 2024 04:23:28 +1000 Subject: [PATCH 39/80] ?? --- modules/core/home.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/modules/core/home.nix b/modules/core/home.nix index 3bfa97f..77af0f8 100755 --- a/modules/core/home.nix +++ b/modules/core/home.nix @@ -2,12 +2,12 @@ { imports = [ - # inputs.home-manager.nixosModules.home-manager + inputs.home-manager.nixosModules.home-manager ]; home-manager = { userUserPackages = true; userGlobalPackages = true; - # extraSpecialArgs = { inherit inputs; }; + extraSpecialArgs = { inherit inputs; }; users.serenity = { imports = [ (import ./../home) ]; home.username = "serenity"; From 967502c419d4b6d00dfe8f16469f52e98e83edb8 Mon Sep 17 00:00:00 2001 From: Serenity-F Date: Fri, 5 Apr 2024 04:24:28 +1000 Subject: [PATCH 40/80] ??? --- modules/core/home.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/core/home.nix b/modules/core/home.nix index 77af0f8..4a5a751 100755 --- a/modules/core/home.nix +++ b/modules/core/home.nix @@ -7,7 +7,7 @@ home-manager = { userUserPackages = true; userGlobalPackages = true; - extraSpecialArgs = { inherit inputs; }; + # extraSpecialArgs = { inherit inputs; }; users.serenity = { imports = [ (import ./../home) ]; home.username = "serenity"; From 6f221f6b530f2dd094ef6e43c41ca78a3e643b27 Mon Sep 17 00:00:00 2001 From: Serenity-F Date: Fri, 5 Apr 2024 09:46:01 +1000 Subject: [PATCH 41/80] ??? --- modules/core/home.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/modules/core/home.nix b/modules/core/home.nix index 4a5a751..da1aa9f 100755 --- a/modules/core/home.nix +++ b/modules/core/home.nix @@ -5,8 +5,8 @@ inputs.home-manager.nixosModules.home-manager ]; home-manager = { - userUserPackages = true; - userGlobalPackages = true; + useUserPackages = true; + useGlobalPackages = true; # extraSpecialArgs = { inherit inputs; }; users.serenity = { imports = [ (import ./../home) ]; @@ -16,8 +16,8 @@ programs = { home-manager.enable = true; direnv = { - enable = true; - nix-direnv.enable = true; + enable = false; + nix-direnv.enable = false; config.load_dotenv = false; }; }; From 22a3d2f994c984b7439bb1842688f8aa109e0989 Mon Sep 17 00:00:00 2001 From: Serenity-F Date: Fri, 5 Apr 2024 09:55:03 +1000 Subject: [PATCH 42/80] ehhh? changed some flake settings --- flake.nix | 15 ++++----------- 1 file changed, 4 insertions(+), 11 deletions(-) diff --git a/flake.nix b/flake.nix index 5008078..5511603 100644 --- a/flake.nix +++ b/flake.nix @@ -34,14 +34,7 @@ }; - outputs = { - self, - nixpkgs, - nixpkgs-unstable, - nixos-hardware, - home-manager, - hyprland, - ... }: + outputs = { self, nixpkgs, nixpkgs-unstable, nixos-hardware, home-manager, hyprland, ... }: let system = "x86_64-linux"; overlay-unstable = final: prev: { @@ -53,18 +46,18 @@ overlay-flake-pkgs = final: prev: { }; common-modules = [ - ({ config, pkgs, ... }: { nixpkgs.overlays = [ overlay-unstable overlay-flake-pkgs ]; }) + # ({ config, pkgs, ... }: { nixpkgs.overlays = [ overlay-unstable overlay-flake-pkgs ]; }) ]; in { nixosConfigurations = { proserpina = nixpkgs.lib.nixosSystem { inherit system; - specialArgs = { inherit hyprland; }; + # specialArgs = { inherit hyprland; }; modules = [ ./hosts/proserpina/configuration.nix # Load muir main nix config # nixos-hardware.nixosModules.$MODEL - ] ++ common-modules; + ]; # ++ common-modules; }; }; }; From 7f75257de59303d5febb8f5d5e4e8b0dbb158860 Mon Sep 17 00:00:00 2001 From: Serenity-F Date: Fri, 5 Apr 2024 09:58:09 +1000 Subject: [PATCH 43/80] uh maybe improved config --- modules/home/programs/default.nix | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/modules/home/programs/default.nix b/modules/home/programs/default.nix index 4315cdd..9ffdf58 100644 --- a/modules/home/programs/default.nix +++ b/modules/home/programs/default.nix @@ -1,14 +1,16 @@ +{ ... }: + { imports = [ ./git.nix - ./gtk.nix - ./btop.nix + # ./gtk.nix + # ./btop.nix ./fish.nix ./kitty.nix ./micro.nix - ./starship.nix - ./vscodium.nix + # ./starship.nix + # ./vscodium.nix ] } From 7980378a5a7ec438b8c38b0ace5ef7e72b91bb5c Mon Sep 17 00:00:00 2001 From: Serenity-F Date: Fri, 5 Apr 2024 09:59:17 +1000 Subject: [PATCH 44/80] added 'pkgs' to scope --- modules/home/programs/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/home/programs/default.nix b/modules/home/programs/default.nix index 9ffdf58..212c7ec 100644 --- a/modules/home/programs/default.nix +++ b/modules/home/programs/default.nix @@ -1,4 +1,4 @@ -{ ... }: +{ pkgs, ... }: { From c4bf565212dff8993a05c783de43478103e51b5a Mon Sep 17 00:00:00 2001 From: Serenity-F Date: Fri, 5 Apr 2024 10:02:07 +1000 Subject: [PATCH 45/80] light corrections --- modules/home/hyprland/default.nix | 2 +- modules/home/hyprland/hyprland.nix | 1 - modules/home/hyprland/variables.nix | 2 ++ 3 files changed, 3 insertions(+), 2 deletions(-) diff --git a/modules/home/hyprland/default.nix b/modules/home/hyprland/default.nix index d1eb184..54ec568 100644 --- a/modules/home/hyprland/default.nix +++ b/modules/home/hyprland/default.nix @@ -1,4 +1,4 @@ -{ inputs, ... }: +{ inputs, pkgs, ... }: { imports = [ (import ./hyprland.nix) ] ++ [ (import ./config.nix) ] diff --git a/modules/home/hyprland/hyprland.nix b/modules/home/hyprland/hyprland.nix index f46b48f..7a16bde 100644 --- a/modules/home/hyprland/hyprland.nix +++ b/modules/home/hyprland/hyprland.nix @@ -29,7 +29,6 @@ ]; wayland.windowManager.hyprland = { - enable = true; systemd.enable = true; xwayland = { diff --git a/modules/home/hyprland/variables.nix b/modules/home/hyprland/variables.nix index 884624e..4588bb8 100644 --- a/modules/home/hyprland/variables.nix +++ b/modules/home/hyprland/variables.nix @@ -1,6 +1,7 @@ { ... }: { + home.sessionVariables = { TERMINAL = "kitty"; @@ -32,4 +33,5 @@ CLUTTER_BACKEND = "wayland"; GTK_THEME = "Catppuccin-Mocha-Compact-Lavender-Dark"; }; + } From 4257958024a54a0c48060064c183611fe35e7a08 Mon Sep 17 00:00:00 2001 From: Serenity-F Date: Fri, 5 Apr 2024 10:04:24 +1000 Subject: [PATCH 46/80] light corrections --- modules/core/home.nix | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/modules/core/home.nix b/modules/core/home.nix index da1aa9f..093def5 100755 --- a/modules/core/home.nix +++ b/modules/core/home.nix @@ -1,18 +1,22 @@ { pkgs, inputs, osConfig, ... }: { + imports = [ inputs.home-manager.nixosModules.home-manager ]; + home-manager = { useUserPackages = true; useGlobalPackages = true; # extraSpecialArgs = { inherit inputs; }; users.serenity = { imports = [ (import ./../home) ]; - home.username = "serenity"; - home.homeDirectory = "/home/serenity"; - home.stateVersion = "23.11"; + home = { + username = "serenity"; + homeDirectory = "/home/serenity/"; + stateVersion = "23.11"; + }; programs = { home-manager.enable = true; direnv = { @@ -57,4 +61,5 @@ # vscodium # gitui # ]; + } From 410258dd6a3b8c41fcac8cf8bf06ac0fbd5f32f4 Mon Sep 17 00:00:00 2001 From: Serenity-F Date: Fri, 5 Apr 2024 12:16:39 +1000 Subject: [PATCH 47/80] moderate corrections --- hosts/proserpina/configuration.nix | 2 +- modules/core/home.nix | 42 ++++++++++++++++++++---------- 2 files changed, 29 insertions(+), 15 deletions(-) diff --git a/hosts/proserpina/configuration.nix b/hosts/proserpina/configuration.nix index 05d9821..7e00610 100644 --- a/hosts/proserpina/configuration.nix +++ b/hosts/proserpina/configuration.nix @@ -3,7 +3,7 @@ { imports = [ # Include the results of the hardware scan. - "${builtins.fetchTarball "https://github.com/nix-community/disko/archive/master.tar.gz"}/module.nix" + "${builtins.fetchTarball 'https://github.com/nix-community/disko/archive/master.tar.gz'}/module.nix" ./disko-config.nix ./network-configuration.nix ./hardware-configuration.nix diff --git a/modules/core/home.nix b/modules/core/home.nix index 093def5..24f27e3 100755 --- a/modules/core/home.nix +++ b/modules/core/home.nix @@ -1,4 +1,4 @@ -{ pkgs, inputs, osConfig, ... }: +{ pkgs, inputs, outputs, config, osConfig, ... }: { @@ -6,10 +6,28 @@ inputs.home-manager.nixosModules.home-manager ]; + + users = { + + defaultUserShell = pkgs.fish; + + users.serenity = { + description = "Serenity"; + isNormalUser = true; + shell = pkgs.fish; + extraGroups = [ + "networkmanager" + "wheel" + ]; + }; + + }; + home-manager = { useUserPackages = true; useGlobalPackages = true; # extraSpecialArgs = { inherit inputs; }; + users.serenity = { imports = [ (import ./../home) ]; home = { @@ -17,6 +35,7 @@ homeDirectory = "/home/serenity/"; stateVersion = "23.11"; }; + programs = { home-manager.enable = true; direnv = { @@ -25,19 +44,16 @@ config.load_dotenv = false; }; }; - # programs.home-manager.enable = true; - }; + + }; + }; - users.users.serenity = { - isNormalUser = true; - description = "Serenity"; - extraGroups = [ - "networkmanager" - "wheel" - ]; - shell = pkgs.fish; - }; + + system.stateVersion = "23.11"; + +} + # Copy some files to where they go # home.file.scripts = { # source = ./scripts; @@ -61,5 +77,3 @@ # vscodium # gitui # ]; - -} From 1abead275dee3a75c21ace6adaa2e15b50a023e9 Mon Sep 17 00:00:00 2001 From: Serenity-F Date: Fri, 5 Apr 2024 12:18:47 +1000 Subject: [PATCH 48/80] typo, replaced single single-quotes with double single-quotes (eg. 'text' -> ''text'' --- hosts/proserpina/configuration.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/hosts/proserpina/configuration.nix b/hosts/proserpina/configuration.nix index 7e00610..1ea422b 100644 --- a/hosts/proserpina/configuration.nix +++ b/hosts/proserpina/configuration.nix @@ -3,7 +3,7 @@ { imports = [ # Include the results of the hardware scan. - "${builtins.fetchTarball 'https://github.com/nix-community/disko/archive/master.tar.gz'}/module.nix" + "${builtins.fetchTarball ''https://github.com/nix-community/disko/archive/master.tar.gz''}/module.nix" ./disko-config.nix ./network-configuration.nix ./hardware-configuration.nix From 7a07746efca4915ef28b3f3c5210cef763b46f37 Mon Sep 17 00:00:00 2001 From: Serenity-F Date: Fri, 5 Apr 2024 12:23:48 +1000 Subject: [PATCH 49/80] replacing 'modules/core/configuration.nix' with 'modules/core/default.nix' also tried fixing disko :? --- hosts/proserpina/configuration.nix | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/hosts/proserpina/configuration.nix b/hosts/proserpina/configuration.nix index 1ea422b..ce89a67 100644 --- a/hosts/proserpina/configuration.nix +++ b/hosts/proserpina/configuration.nix @@ -1,13 +1,15 @@ -{ inputs, outputs, config, pkgs, lib, ... }: +{ inputs, outputs, config, lib, pkgs, ... }: { imports = [ # Include the results of the hardware scan. - "${builtins.fetchTarball ''https://github.com/nix-community/disko/archive/master.tar.gz''}/module.nix" + ./hardware-configuration.nix + "${builtins.fetchTarball "https://github.com/nix-community/disko/archive/master.tar.gz"}/module.nix" ./disko-config.nix ./network-configuration.nix - ./hardware-configuration.nix - ./../../modules/core/configuration.nix + + ./../../modules/core + ]; # Enable swap on luks From 0801a929bd6eb087ffef57129c3553b09f7a4333 Mon Sep 17 00:00:00 2001 From: Serenity-F Date: Fri, 5 Apr 2024 12:25:34 +1000 Subject: [PATCH 50/80] replacing 'modules/core/configuration.nix' with 'modules/core/default.nix' --- modules/core/{configuration.nix => default.nix} | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) rename modules/core/{configuration.nix => default.nix} (96%) diff --git a/modules/core/configuration.nix b/modules/core/default.nix similarity index 96% rename from modules/core/configuration.nix rename to modules/core/default.nix index 6615776..5bb329e 100755 --- a/modules/core/configuration.nix +++ b/modules/core/default.nix @@ -1,4 +1,4 @@ -{ pkgs, lib, ... }: +{ config, lib, pkgs, ... }: { imports = [ From 4f5acf57ad4d07374a62c9b8564931ed16adc2dc Mon Sep 17 00:00:00 2001 From: Serenity-F Date: Fri, 5 Apr 2024 12:47:04 +1000 Subject: [PATCH 51/80] might've fixed disko ??? OMG TOTES GOATS ??? --- flake.nix | 37 ++++++++++++++++++------------ hosts/proserpina/configuration.nix | 2 +- hosts/proserpina/disko-config.nix | 7 ++++++ 3 files changed, 30 insertions(+), 16 deletions(-) diff --git a/flake.nix b/flake.nix index 5511603..843dacc 100644 --- a/flake.nix +++ b/flake.nix @@ -7,34 +7,40 @@ nixpkgs.url = "nixpkgs/nixos-23.11"; nixpkgs-unstable.url = "nixpkgs/nixos-unstable"; nixos-hardware.url = "github:NixOS/nixos-hardware/master"; - - # nixos user repository ? :o - # nur.url = "git:nix-community/NUR"; - - # alejandra ?? think its a code formatter + + # alejandra ?? think its a nix code formatter # alejandra.url = "github:kamadorueda/alejandra/3.0.0"; - # nix gaming ? - # nix-gaming.url = "github:fufexan/nix-gaming"; + # declaratice disks + disko = { + url = "github:nix-community/disko"; + inputs.nixpkgs.follows = "nixpkgs"; + }; # declarative dots home-manager = { url = "github:nix-community/home-manager/release-23.11"; inputs.nixpkgs.follows = "nixpkgs"; - }; - + }; # window manager (ricer friendly) hyprland = { url = "github:hyprwm/Hyprland"; inputs.nixpkgs.follows = "nixpkgs"; }; - - hyprpicker.url = "github:hyprwm/hyprpicker"; - # hypr-contrib.url = "github:hyprwm/contrib"; }; - outputs = { self, nixpkgs, nixpkgs-unstable, nixos-hardware, home-manager, hyprland, ... }: + outputs = { + self, + nixpkgs, + nixpkgs-unstable, + nixos-hardware, + disko, + home-manager, + hyprland, + ... + }: + let system = "x86_64-linux"; overlay-unstable = final: prev: { @@ -46,7 +52,7 @@ overlay-flake-pkgs = final: prev: { }; common-modules = [ - # ({ config, pkgs, ... }: { nixpkgs.overlays = [ overlay-unstable overlay-flake-pkgs ]; }) + ({ config, pkgs, ... }: { nixpkgs.overlays = [ overlay-unstable overlay-flake-pkgs ]; }) ]; in { @@ -55,9 +61,10 @@ inherit system; # specialArgs = { inherit hyprland; }; modules = [ + disko.nixosModules.disko ./hosts/proserpina/configuration.nix # Load muir main nix config # nixos-hardware.nixosModules.$MODEL - ]; # ++ common-modules; + ] ++ common-modules; }; }; }; diff --git a/hosts/proserpina/configuration.nix b/hosts/proserpina/configuration.nix index ce89a67..c652a14 100644 --- a/hosts/proserpina/configuration.nix +++ b/hosts/proserpina/configuration.nix @@ -4,7 +4,7 @@ imports = [ # Include the results of the hardware scan. ./hardware-configuration.nix - "${builtins.fetchTarball "https://github.com/nix-community/disko/archive/master.tar.gz"}/module.nix" + # "${builtins.fetchTarball "https://github.com/nix-community/disko/archive/master.tar.gz"}/module.nix" ./disko-config.nix ./network-configuration.nix diff --git a/hosts/proserpina/disko-config.nix b/hosts/proserpina/disko-config.nix index ecc32ac..06b376d 100644 --- a/hosts/proserpina/disko-config.nix +++ b/hosts/proserpina/disko-config.nix @@ -1,4 +1,5 @@ { + disko.devices = { disk = { sda = { @@ -19,6 +20,7 @@ ]; }; }; + luks = { size = "100%"; content = { @@ -31,6 +33,7 @@ #keyFile = "/tmp/secret.key"; }; # additionalKeyFiles = [ "/tmp/additionalSecret.key" ]; + content = { type = "btrfs"; extraArgs = [ "-f" ]; @@ -49,11 +52,15 @@ }; }; }; + }; }; + }; }; }; }; + }; + } From 64b0e97d798756594a42fd921b5f879f648361be Mon Sep 17 00:00:00 2001 From: Serenity-F Date: Fri, 5 Apr 2024 12:49:01 +1000 Subject: [PATCH 52/80] unsure what wei forgor lol ? --- flake.lock | 70 ++++++++++++++++++++++-------------------------------- 1 file changed, 28 insertions(+), 42 deletions(-) diff --git a/flake.lock b/flake.lock index fcf199c..4baa98c 100644 --- a/flake.lock +++ b/flake.lock @@ -1,5 +1,25 @@ { "nodes": { + "disko": { + "inputs": { + "nixpkgs": [ + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1711934712, + "narHash": "sha256-sBDe+QmX/QohlnKeSEzrftcXyZL5FY09OMjZ59Rpyy4=", + "owner": "nix-community", + "repo": "disko", + "rev": "611c9ea53250f7bb22286b3d26872280a0e608f9", + "type": "github" + }, + "original": { + "owner": "nix-community", + "repo": "disko", + "type": "github" + } + }, "home-manager": { "inputs": { "nixpkgs": [ @@ -146,24 +166,6 @@ "type": "github" } }, - "hyprpicker": { - "inputs": { - "nixpkgs": "nixpkgs" - }, - "locked": { - "lastModified": 1711283076, - "narHash": "sha256-Cda+XbHpvyz3HhdJ7FlXFoaazOWtdBoOWmEaj4ZFwRM=", - "owner": "hyprwm", - "repo": "hyprpicker", - "rev": "0eb49192a5cdd5e6e8e6c2c82c33857d78d6cd56", - "type": "github" - }, - "original": { - "owner": "hyprwm", - "repo": "hyprpicker", - "type": "github" - } - }, "nixos-hardware": { "locked": { "lastModified": 1711352745, @@ -182,18 +184,17 @@ }, "nixpkgs": { "locked": { - "lastModified": 1683014792, - "narHash": "sha256-6Va9iVtmmsw4raBc3QKvQT2KT/NGRWlvUlJj46zN8B8=", + "lastModified": 1712168706, + "narHash": "sha256-XP24tOobf6GGElMd0ux90FEBalUtw6NkBSVh/RlA6ik=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "1a411f23ba299db155a5b45d5e145b85a7aafc42", + "rev": "1487bdea619e4a7a53a4590c475deabb5a9d1bfb", "type": "github" }, "original": { - "owner": "NixOS", - "ref": "nixos-unstable", - "repo": "nixpkgs", - "type": "github" + "id": "nixpkgs", + "ref": "nixos-23.11", + "type": "indirect" } }, "nixpkgs-unstable": { @@ -211,28 +212,13 @@ "type": "indirect" } }, - "nixpkgs_2": { - "locked": { - "lastModified": 1712168706, - "narHash": "sha256-XP24tOobf6GGElMd0ux90FEBalUtw6NkBSVh/RlA6ik=", - "owner": "NixOS", - "repo": "nixpkgs", - "rev": "1487bdea619e4a7a53a4590c475deabb5a9d1bfb", - "type": "github" - }, - "original": { - "id": "nixpkgs", - "ref": "nixos-23.11", - "type": "indirect" - } - }, "root": { "inputs": { + "disko": "disko", "home-manager": "home-manager", "hyprland": "hyprland", - "hyprpicker": "hyprpicker", "nixos-hardware": "nixos-hardware", - "nixpkgs": "nixpkgs_2", + "nixpkgs": "nixpkgs", "nixpkgs-unstable": "nixpkgs-unstable" } }, From f59e523cb4a5fcab549cbb844a3add1f27d44ccf Mon Sep 17 00:00:00 2001 From: Serenity-F Date: Fri, 5 Apr 2024 12:49:56 +1000 Subject: [PATCH 53/80] come ooon home-manager, pls worky ? :pleading: --- modules/core/home.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/core/home.nix b/modules/core/home.nix index 24f27e3..70f4d06 100755 --- a/modules/core/home.nix +++ b/modules/core/home.nix @@ -3,7 +3,7 @@ { imports = [ - inputs.home-manager.nixosModules.home-manager + # inputs.home-manager.nixosModules.home-manager ]; From 80497bea2bf499faa781d155832159e4b4ff300f Mon Sep 17 00:00:00 2001 From: Serenity-F Date: Fri, 5 Apr 2024 12:51:52 +1000 Subject: [PATCH 54/80] come ooon home-manager, pls worky ? :pleading_crying: --- flake.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/flake.nix b/flake.nix index 843dacc..1f72f1a 100644 --- a/flake.nix +++ b/flake.nix @@ -62,6 +62,7 @@ # specialArgs = { inherit hyprland; }; modules = [ disko.nixosModules.disko + home-manager.nixosModules.home-manager ./hosts/proserpina/configuration.nix # Load muir main nix config # nixos-hardware.nixosModules.$MODEL ] ++ common-modules; From 4cb6af2b40b39a4d0790313cb38bf664e0f38f10 Mon Sep 17 00:00:00 2001 From: Serenity-F Date: Fri, 5 Apr 2024 12:54:40 +1000 Subject: [PATCH 55/80] come ooon home-manager, pls worky ? :pleading_crying: :pissing: --- modules/core/home.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/modules/core/home.nix b/modules/core/home.nix index 70f4d06..bbeb764 100755 --- a/modules/core/home.nix +++ b/modules/core/home.nix @@ -24,8 +24,8 @@ }; home-manager = { - useUserPackages = true; - useGlobalPackages = true; + useUserPkgs = true; + useGlobalPkgs = true; # extraSpecialArgs = { inherit inputs; }; users.serenity = { From fcb1fc5c8e0b62ae45a3105d724dc13cbfbbbaa5 Mon Sep 17 00:00:00 2001 From: Serenity-F Date: Fri, 5 Apr 2024 13:04:27 +1000 Subject: [PATCH 56/80] come ooon home-manager, pls worky ? :pleading_crying: :pissing: :laughing: --- flake.nix | 47 +++++++++++++++++++++-------------------------- 1 file changed, 21 insertions(+), 26 deletions(-) diff --git a/flake.nix b/flake.nix index 1f72f1a..18f8983 100644 --- a/flake.nix +++ b/flake.nix @@ -4,8 +4,8 @@ inputs = { # Nixpkgs and hardware specific configs - nixpkgs.url = "nixpkgs/nixos-23.11"; - nixpkgs-unstable.url = "nixpkgs/nixos-unstable"; + # nixpkgs.url = "nixpkgs/nixos-23.11"; + nixpkgs.url = "nixpkgs/nixos-unstable"; nixos-hardware.url = "github:NixOS/nixos-hardware/master"; # alejandra ?? think its a nix code formatter @@ -21,7 +21,7 @@ home-manager = { url = "github:nix-community/home-manager/release-23.11"; inputs.nixpkgs.follows = "nixpkgs"; - }; + }; # window manager (ricer friendly) hyprland = { url = "github:hyprwm/Hyprland"; @@ -33,41 +33,36 @@ outputs = { self, nixpkgs, - nixpkgs-unstable, nixos-hardware, disko, home-manager, hyprland, ... - }: - - let - system = "x86_64-linux"; - overlay-unstable = final: prev: { - unstable = import nixpkgs-unstable { - inherit system; - config.allowUnfree = true; - }; - }; - overlay-flake-pkgs = final: prev: { - }; - common-modules = [ - ({ config, pkgs, ... }: { nixpkgs.overlays = [ overlay-unstable overlay-flake-pkgs ]; }) - ]; - in - { + }: { nixosConfigurations = { proserpina = nixpkgs.lib.nixosSystem { inherit system; - # specialArgs = { inherit hyprland; }; + specialArgs = { inherit hyprland; }; modules = [ + + ./hosts/proserpina/configuration.nix disko.nixosModules.disko - home-manager.nixosModules.home-manager - ./hosts/proserpina/configuration.nix # Load muir main nix config # nixos-hardware.nixosModules.$MODEL - ] ++ common-modules; + + home-manager.nixosModules.home-manager + { + home-manager = { + useGlobalPkgs = true; + useUserPackages = true; + users = { + serenity = import ./modules/core/home.nix + }; + }; + } + + ]; }; }; - }; + }; } From 28ffa949f7b721b6952fc40eb1c81ed7e07f4e07 Mon Sep 17 00:00:00 2001 From: Serenity-F Date: Fri, 5 Apr 2024 13:05:19 +1000 Subject: [PATCH 57/80] come ooon home-manager, pls worky ? :pleading_crying: :pissing: :laughing: 2 --- modules/core/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/core/default.nix b/modules/core/default.nix index 5bb329e..b79a2dc 100755 --- a/modules/core/default.nix +++ b/modules/core/default.nix @@ -4,7 +4,7 @@ imports = [ ./services.nix ./display.nix - ./home.nix + # ./home.nix ./packages ]; From f44d5016e4f1e62ffd89862919afd43476797816 Mon Sep 17 00:00:00 2001 From: Serenity-F Date: Fri, 5 Apr 2024 13:06:46 +1000 Subject: [PATCH 58/80] fixed typo: dropped a semi-colon --- flake.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/flake.nix b/flake.nix index 18f8983..81971f1 100644 --- a/flake.nix +++ b/flake.nix @@ -55,7 +55,7 @@ useGlobalPkgs = true; useUserPackages = true; users = { - serenity = import ./modules/core/home.nix + serenity = import ./modules/core/home.nix; }; }; } From aa96f9d86ed87456785c13cc8d6ad1ccc8e2bd77 Mon Sep 17 00:00:00 2001 From: Serenity-F Date: Fri, 5 Apr 2024 13:08:37 +1000 Subject: [PATCH 59/80] hmmmmmm - idk if wei're learning, or just trialling and erroring :shrugshrugge: --- flake.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/flake.nix b/flake.nix index 81971f1..db488d0 100644 --- a/flake.nix +++ b/flake.nix @@ -41,7 +41,7 @@ }: { nixosConfigurations = { proserpina = nixpkgs.lib.nixosSystem { - inherit system; + system = "x86_64-linux"; specialArgs = { inherit hyprland; }; modules = [ From 205819c7f5dc32e05b981a947c1250e411ea5702 Mon Sep 17 00:00:00 2001 From: Serenity-F Date: Fri, 5 Apr 2024 13:09:53 +1000 Subject: [PATCH 60/80] fixed typo: 'import' -> 'imports' --- flake.lock | 18 +----------------- modules/core/packages/default.nix | 2 +- 2 files changed, 2 insertions(+), 18 deletions(-) diff --git a/flake.lock b/flake.lock index 4baa98c..91e4cbf 100644 --- a/flake.lock +++ b/flake.lock @@ -183,21 +183,6 @@ } }, "nixpkgs": { - "locked": { - "lastModified": 1712168706, - "narHash": "sha256-XP24tOobf6GGElMd0ux90FEBalUtw6NkBSVh/RlA6ik=", - "owner": "NixOS", - "repo": "nixpkgs", - "rev": "1487bdea619e4a7a53a4590c475deabb5a9d1bfb", - "type": "github" - }, - "original": { - "id": "nixpkgs", - "ref": "nixos-23.11", - "type": "indirect" - } - }, - "nixpkgs-unstable": { "locked": { "lastModified": 1712163089, "narHash": "sha256-Um+8kTIrC19vD4/lUCN9/cU9kcOsD1O1m+axJqQPyMM=", @@ -218,8 +203,7 @@ "home-manager": "home-manager", "hyprland": "hyprland", "nixos-hardware": "nixos-hardware", - "nixpkgs": "nixpkgs", - "nixpkgs-unstable": "nixpkgs-unstable" + "nixpkgs": "nixpkgs" } }, "systems": { diff --git a/modules/core/packages/default.nix b/modules/core/packages/default.nix index f6df04b..e33b538 100644 --- a/modules/core/packages/default.nix +++ b/modules/core/packages/default.nix @@ -2,7 +2,7 @@ { - import = [ + imports = [ ./packages.nix ]; From 7fb488cccb11d011eeceb90fc52deafda1c5cc6a Mon Sep 17 00:00:00 2001 From: Serenity-F Date: Fri, 5 Apr 2024 13:10:46 +1000 Subject: [PATCH 61/80] fixed typo: '=' -> '-' --- modules/core/packages/packages.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/core/packages/packages.nix b/modules/core/packages/packages.nix index 300a7b8..6e5ca53 100644 --- a/modules/core/packages/packages.nix +++ b/modules/core/packages/packages.nix @@ -5,7 +5,7 @@ environment.systemPackages = with pkgs; [ ## web browsers - tor-browser-bundle=bin + tor-browser-bundle-bin # lagrange firefox From 50b0825a82313e35ee5c624e093b0afcc54b6eb6 Mon Sep 17 00:00:00 2001 From: Serenity-F Date: Fri, 5 Apr 2024 13:13:13 +1000 Subject: [PATCH 62/80] added pkgs to scope --- modules/core/packages/packages.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/core/packages/packages.nix b/modules/core/packages/packages.nix index 6e5ca53..fe6accf 100644 --- a/modules/core/packages/packages.nix +++ b/modules/core/packages/packages.nix @@ -1,4 +1,4 @@ -{ ... }: +{ pkgs, lib, ... }: { From 6493eca3fe7b3e52dc9b47c474159269f52bfbeb Mon Sep 17 00:00:00 2001 From: Serenity-F Date: Fri, 5 Apr 2024 13:15:13 +1000 Subject: [PATCH 63/80] fixed typo 'hostname' -> 'hostName' --- hosts/proserpina/network-configuration.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/hosts/proserpina/network-configuration.nix b/hosts/proserpina/network-configuration.nix index ded6728..eb93781 100644 --- a/hosts/proserpina/network-configuration.nix +++ b/hosts/proserpina/network-configuration.nix @@ -7,7 +7,7 @@ ]; networking = { - hostname = "proserpina"; + hostName = "proserpina"; wireless.enable = false; networkmanager = { enable = true; From c53a810c219f4f8c71a6565d2950557c1cc7024b Mon Sep 17 00:00:00 2001 From: Serenity-F Date: Fri, 5 Apr 2024 13:16:11 +1000 Subject: [PATCH 64/80] disabled gnome keyring for now --- modules/core/services.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/core/services.nix b/modules/core/services.nix index 246d3f9..dc9fad5 100644 --- a/modules/core/services.nix +++ b/modules/core/services.nix @@ -10,7 +10,7 @@ gvfs.enable = true; dbus.enable = true; - gnome-keyring.enable = true; + # gnome-keyring.enable = true; openssh.enable = false; From 6a836fea4955f40cdafb7cc610af6d0d9a1d3037 Mon Sep 17 00:00:00 2001 From: Serenity-F Date: Fri, 5 Apr 2024 13:43:33 +1000 Subject: [PATCH 65/80] come ooon home-manager, pls worky ? :pleading_crying: :pissing: :laughing: 3 --- flake.nix | 5 ++--- modules/core/home.nix | 4 +--- 2 files changed, 3 insertions(+), 6 deletions(-) diff --git a/flake.nix b/flake.nix index db488d0..9a9e06b 100644 --- a/flake.nix +++ b/flake.nix @@ -44,11 +44,10 @@ system = "x86_64-linux"; specialArgs = { inherit hyprland; }; modules = [ - + + # nixos-hardware.nixosModules.$MODEL ./hosts/proserpina/configuration.nix disko.nixosModules.disko - # nixos-hardware.nixosModules.$MODEL - home-manager.nixosModules.home-manager { home-manager = { diff --git a/modules/core/home.nix b/modules/core/home.nix index bbeb764..317c93b 100755 --- a/modules/core/home.nix +++ b/modules/core/home.nix @@ -3,7 +3,7 @@ { imports = [ - # inputs.home-manager.nixosModules.home-manager + inputs.home-manager.nixosModules.home-manager ]; @@ -24,8 +24,6 @@ }; home-manager = { - useUserPkgs = true; - useGlobalPkgs = true; # extraSpecialArgs = { inherit inputs; }; users.serenity = { From b9a3eff10becc0298ce3f534d8ad516d7b012fe2 Mon Sep 17 00:00:00 2001 From: Serenity-F Date: Fri, 5 Apr 2024 14:12:55 +1000 Subject: [PATCH 66/80] come ooon home-manager, pls worky ? :pleading_crying: :pissing: :laughing: 4 --- flake.nix | 48 ++++++++++++++++++++++++++++--------------- modules/core/home.nix | 4 ---- 2 files changed, 32 insertions(+), 20 deletions(-) diff --git a/flake.nix b/flake.nix index 9a9e06b..767a6af 100644 --- a/flake.nix +++ b/flake.nix @@ -38,30 +38,46 @@ home-manager, hyprland, ... - }: { + }: + + let + + system = "x86_64-linux"; + + home-manager-config = toplevel: [ + home-manager.nixosModules.home-manager + { + home-manager = { + useGlobalPkgs = true; + useUserPackages = true; + extraSpecialArgs = { inherit inputs; }; + users.serenity = toplevel; + users.serenity = { + imports = [ + (import ./modules/core/home.nix) + ]; + }; + }; + } + ]; + + in + + { nixosConfigurations = { proserpina = nixpkgs.lib.nixosSystem { - system = "x86_64-linux"; - specialArgs = { inherit hyprland; }; + inherit system; + # specialArgs = { inherit hyprland; }; modules = [ - # nixos-hardware.nixosModules.$MODEL ./hosts/proserpina/configuration.nix disko.nixosModules.disko - home-manager.nixosModules.home-manager - { - home-manager = { - useGlobalPkgs = true; - useUserPackages = true; - users = { - serenity = import ./modules/core/home.nix; - }; - }; - } - - ]; + ] ++ home-manager-config; }; }; }; + + system.stateVersion = "23.11"; + } diff --git a/modules/core/home.nix b/modules/core/home.nix index 317c93b..24b3143 100755 --- a/modules/core/home.nix +++ b/modules/core/home.nix @@ -3,7 +3,6 @@ { imports = [ - inputs.home-manager.nixosModules.home-manager ]; @@ -24,10 +23,7 @@ }; home-manager = { - # extraSpecialArgs = { inherit inputs; }; - users.serenity = { - imports = [ (import ./../home) ]; home = { username = "serenity"; homeDirectory = "/home/serenity/"; From 47366d4e684baec149a3e4ee48858b7267c71470 Mon Sep 17 00:00:00 2001 From: Serenity-F Date: Fri, 5 Apr 2024 14:24:02 +1000 Subject: [PATCH 67/80] come ooon home-manager, pls worky ? :pleading_crying: :pissing: :laughing: 5 --- flake.nix | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/flake.nix b/flake.nix index 767a6af..d26dae1 100644 --- a/flake.nix +++ b/flake.nix @@ -52,11 +52,11 @@ useUserPackages = true; extraSpecialArgs = { inherit inputs; }; users.serenity = toplevel; - users.serenity = { - imports = [ - (import ./modules/core/home.nix) - ]; - }; + # users.serenity = { + # imports = [ + # (import ./modules/core/home.nix) + # ]; + # }; }; } ]; From f17e064dceef2c0c61cc97cef2bd8e59ffd0d371 Mon Sep 17 00:00:00 2001 From: Serenity-F Date: Fri, 5 Apr 2024 14:25:26 +1000 Subject: [PATCH 68/80] come ooon home-manager, pls worky ? :pleading_crying: :pissing: :laughing: 6 --- flake.nix | 1 - 1 file changed, 1 deletion(-) diff --git a/flake.nix b/flake.nix index d26dae1..a0b737c 100644 --- a/flake.nix +++ b/flake.nix @@ -50,7 +50,6 @@ home-manager = { useGlobalPkgs = true; useUserPackages = true; - extraSpecialArgs = { inherit inputs; }; users.serenity = toplevel; # users.serenity = { # imports = [ From ea6f142185a31292c8c326765730149c8b1ff9b6 Mon Sep 17 00:00:00 2001 From: Serenity-F Date: Fri, 5 Apr 2024 14:26:45 +1000 Subject: [PATCH 69/80] come ooon home-manager, pls worky ? :pleading_crying: :pissing: :laughing: 7 --- flake.nix | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/flake.nix b/flake.nix index a0b737c..8ab6ef4 100644 --- a/flake.nix +++ b/flake.nix @@ -41,9 +41,6 @@ }: let - - system = "x86_64-linux"; - home-manager-config = toplevel: [ home-manager.nixosModules.home-manager { @@ -65,7 +62,7 @@ { nixosConfigurations = { proserpina = nixpkgs.lib.nixosSystem { - inherit system; + system = "x86_64-linux"; # specialArgs = { inherit hyprland; }; modules = [ # nixos-hardware.nixosModules.$MODEL From 7b791aef8f18a09c18292196526490bbc4cc1cb0 Mon Sep 17 00:00:00 2001 From: Serenity-F Date: Fri, 5 Apr 2024 14:31:59 +1000 Subject: [PATCH 70/80] come ooon home-manager, pls worky ? :pleading_crying: :pissing: :laughing: 8 --- flake.nix | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/flake.nix b/flake.nix index 8ab6ef4..cae5993 100644 --- a/flake.nix +++ b/flake.nix @@ -31,7 +31,7 @@ }; outputs = { - self, + # self, nixpkgs, nixos-hardware, disko, @@ -41,6 +41,10 @@ }: let + system = "x86_64-linux"; + # common-modules = [ + # ({ config, pkgs, ... }:) + # ]; home-manager-config = toplevel: [ home-manager.nixosModules.home-manager { @@ -56,13 +60,12 @@ }; } ]; - in { nixosConfigurations = { proserpina = nixpkgs.lib.nixosSystem { - system = "x86_64-linux"; + inherit system; # = "x86_64-linux"; # specialArgs = { inherit hyprland; }; modules = [ # nixos-hardware.nixosModules.$MODEL From 357a6e03843aaa83b83ea9b2aa5c558b29a4f067 Mon Sep 17 00:00:00 2001 From: Serenity-F Date: Fri, 5 Apr 2024 14:34:43 +1000 Subject: [PATCH 71/80] come ooon home-manager, pls worky ? :pleading_crying: :pissing: :laughing: 9 --- flake.nix | 14 ++++++-------- 1 file changed, 6 insertions(+), 8 deletions(-) diff --git a/flake.nix b/flake.nix index cae5993..b039feb 100644 --- a/flake.nix +++ b/flake.nix @@ -41,7 +41,6 @@ }: let - system = "x86_64-linux"; # common-modules = [ # ({ config, pkgs, ... }:) # ]; @@ -51,12 +50,11 @@ home-manager = { useGlobalPkgs = true; useUserPackages = true; - users.serenity = toplevel; - # users.serenity = { - # imports = [ - # (import ./modules/core/home.nix) - # ]; - # }; + users.serenity = { + imports = [ + (import ./modules/core/home.nix) + ]; + }; }; } ]; @@ -65,7 +63,7 @@ { nixosConfigurations = { proserpina = nixpkgs.lib.nixosSystem { - inherit system; # = "x86_64-linux"; + system; = "x86_64-linux"; # specialArgs = { inherit hyprland; }; modules = [ # nixos-hardware.nixosModules.$MODEL From 7c6572200092594cae1bcb27be9f449ddb82fe26 Mon Sep 17 00:00:00 2001 From: Serenity-F Date: Fri, 5 Apr 2024 14:35:37 +1000 Subject: [PATCH 72/80] fixed typo: removed semi-colon --- flake.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/flake.nix b/flake.nix index b039feb..fe397e5 100644 --- a/flake.nix +++ b/flake.nix @@ -63,7 +63,7 @@ { nixosConfigurations = { proserpina = nixpkgs.lib.nixosSystem { - system; = "x86_64-linux"; + system = "x86_64-linux"; # specialArgs = { inherit hyprland; }; modules = [ # nixos-hardware.nixosModules.$MODEL From 8847927b54a0f8433b6512ce92c3a718c8545432 Mon Sep 17 00:00:00 2001 From: Serenity-F Date: Fri, 5 Apr 2024 14:36:14 +1000 Subject: [PATCH 73/80] fine fuck it, try and install on arm, see if wei care, shithead --- flake.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/flake.nix b/flake.nix index fe397e5..fcb1d74 100644 --- a/flake.nix +++ b/flake.nix @@ -63,7 +63,7 @@ { nixosConfigurations = { proserpina = nixpkgs.lib.nixosSystem { - system = "x86_64-linux"; + # system = "x86_64-linux"; # specialArgs = { inherit hyprland; }; modules = [ # nixos-hardware.nixosModules.$MODEL From 474fb92ddf143f27fb7ec906730398e82a76d27f Mon Sep 17 00:00:00 2001 From: Serenity-F Date: Fri, 5 Apr 2024 14:37:39 +1000 Subject: [PATCH 74/80] the fool is muis (._. ) --- flake.nix | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/flake.nix b/flake.nix index fcb1d74..08e43de 100644 --- a/flake.nix +++ b/flake.nix @@ -63,7 +63,7 @@ { nixosConfigurations = { proserpina = nixpkgs.lib.nixosSystem { - # system = "x86_64-linux"; + system = "x86_64-linux"; # specialArgs = { inherit hyprland; }; modules = [ # nixos-hardware.nixosModules.$MODEL @@ -74,7 +74,4 @@ }; }; - - system.stateVersion = "23.11"; - } From 6ebc5992b56c6fdd575ca98b7205ac4867585f93 Mon Sep 17 00:00:00 2001 From: Serenity-F Date: Fri, 5 Apr 2024 14:40:18 +1000 Subject: [PATCH 75/80] updated packages/default.nix --- modules/core/packages/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/core/packages/default.nix b/modules/core/packages/default.nix index e33b538..0aded45 100644 --- a/modules/core/packages/default.nix +++ b/modules/core/packages/default.nix @@ -1,4 +1,4 @@ -{ self, pkgs, lib, inputs, ... }: +{pkgs, config, lib, inputs, ... }: { From d91ebd51378e7dfe4d8acad6547601b347b775b9 Mon Sep 17 00:00:00 2001 From: Serenity-F Date: Fri, 5 Apr 2024 14:43:22 +1000 Subject: [PATCH 76/80] updated packages/default.nix & /packages.nix --- modules/core/packages/default.nix | 2 +- modules/core/packages/packages.nix | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/modules/core/packages/default.nix b/modules/core/packages/default.nix index 0aded45..e8e4b78 100644 --- a/modules/core/packages/default.nix +++ b/modules/core/packages/default.nix @@ -1,4 +1,4 @@ -{pkgs, config, lib, inputs, ... }: +{pkgs, config, inputs, ... }: { diff --git a/modules/core/packages/packages.nix b/modules/core/packages/packages.nix index fe6accf..5e95670 100644 --- a/modules/core/packages/packages.nix +++ b/modules/core/packages/packages.nix @@ -1,4 +1,4 @@ -{ pkgs, lib, ... }: +{ pkgs, ... }: { From 668cfa5e26182205756f05123b469eee362cc3a4 Mon Sep 17 00:00:00 2001 From: Serenity-F Date: Fri, 5 Apr 2024 15:08:58 +1000 Subject: [PATCH 77/80] calling it quits for today maybe. --- README.md | 73 ++++++++++++++++++++++++++++++++++++++++++++++++++-- STRUCTURE.md | 19 -------------- TODO.md | 22 ---------------- 3 files changed, 71 insertions(+), 43 deletions(-) delete mode 100644 STRUCTURE.md delete mode 100644 TODO.md diff --git a/README.md b/README.md index 0e1ac3d..0b8050c 100644 --- a/README.md +++ b/README.md @@ -1,6 +1,75 @@ +--- + uh so, yeah, wei dunno, wei couldn't even fiure out how to make flakes and home manager and w/e else work with GNOME, so instead wei are jumping into a tiling WM because that will definitely be "easier" ... right ? ... ? -[Structure](STRUCTURE.md) - [Hyprland](https://hyprland.org/) + +--- + +To Do, in order of priority + +--- + + - [ ] build ultraminimal general config **branch** + - [ ] build ultraminimal hyprland **branch**, following above structure + - [ ] build ultraminimal gnome **branch**, following main structure + - [ ] create new branch, merge, make default branch if: + - [ ] get flake to actually build + + - [?] build ~~minimal~~ *near complete* system-framework/scaffolding for configuration around hyprland + + - [X] steal, i mean, uh, look at, other creature's nixos/hyprland setups (FrostPhoenix) + - [?] *fully* convert/swap/cannibalise configs to match needs/wants + + - [ ] build user configuration + - [ ] multi-user support + - [ ] select media for wallpapers, avatars, etc. + + - [ ] per host hardware configurations + - [ ] Hades + - [X] Proserpina + +--- + +Cursory flake structure [Heavily WIP] + +--- + +``` +. +├── flake.nix [BROKEN] +├── hosts +│ ├── hades [MISSING] +│ └── proserpina (incomplete?) +└── modules + ├── core [INCOMPLETE/BROKEN] + │ ├── audio + │ ├── default + │ ├── display + │ ├── home + │ ├── packages + │ └── services + └── home + ├── hyprland (stolen configs for now) + │ ├── stylix + │ ├── waybar + │ └── wofi + ├── programs (stolen configs for now) + │ ├── btop + │ ├── discord + │ ├── fish + │ ├── gaming + │ ├── git + │ ├── gtk + │ ├── kitty + │ ├── micro + │ ├── starship + │ └── vscodium + ├── resources + │ ├── icons [MISSING] + │ └── wallpapers [MISSING] + └── scripts (stolen) +``` + +--- diff --git a/STRUCTURE.md b/STRUCTURE.md deleted file mode 100644 index 64a5335..0000000 --- a/STRUCTURE.md +++ /dev/null @@ -1,19 +0,0 @@ -### Flake Structure - ---- - -``` -. -├── flake.nix -├── hosts -│ ├── hades -│ └── proserpina -└── modules - ├── core - └── home - ├── hyprland - ├── programs - ├── resources - └── scripts -``` ---- diff --git a/TODO.md b/TODO.md deleted file mode 100644 index 54d5cee..0000000 --- a/TODO.md +++ /dev/null @@ -1,22 +0,0 @@ ---- - -# To Do - -
-- In order of priority - ---- - - - [ ] get flake to actually build - - [X] steal, i mean, uh, look at, other creature's nixos/hyprland setups (FrostPhoenix) - - [ ] *fully* convert/swap/cannibalise configs to match needs/wants - - [ ] build ~~minimal~~ *near complete* system-framework/scaffolding for configuration around hyprland - - [ ] build user configuration - - [ ] optional multi-user support - - [ ] select media for wallpapers, avatars, etc. - - [ ] per host hardware configurations - - [ ] Hades - - [X] Proserpina - - [ ] add secondary/fallback configuration options for GDM/GNOME - ---- From 07575c5a205dcd9e257fce29c7a7647d8435eabd Mon Sep 17 00:00:00 2001 From: Serenity-F Date: Fri, 5 Apr 2024 18:22:09 +1000 Subject: [PATCH 78/80] updated README.me --- README.md | 14 ++++++-------- 1 file changed, 6 insertions(+), 8 deletions(-) diff --git a/README.md b/README.md index 0b8050c..fbc6de7 100644 --- a/README.md +++ b/README.md @@ -17,15 +17,13 @@ To Do, in order of priority - [ ] create new branch, merge, make default branch if: - [ ] get flake to actually build - - [?] build ~~minimal~~ *near complete* system-framework/scaffolding for configuration around hyprland - - [X] steal, i mean, uh, look at, other creature's nixos/hyprland setups (FrostPhoenix) - - [?] *fully* convert/swap/cannibalise configs to match needs/wants - - - [ ] build user configuration - - [ ] multi-user support - - [ ] select media for wallpapers, avatars, etc. - + - [ ] *fully* convert/swap/cannibalise configs to match needs/wants + - [X] build ~~minimal~~ *near complete* system-framework/scaffolding for configuration around hyprland + - [ ] build user configuration + - [ ] select media for wallpapers, avatars, etc. + - [ ] multi-user support + - [ ] per host hardware configurations - [ ] Hades - [X] Proserpina From 15bc5ec7134b990bb5e97c1bdb63b3c1851bb759 Mon Sep 17 00:00:00 2001 From: Serenity-F Date: Fri, 5 Apr 2024 18:26:39 +1000 Subject: [PATCH 79/80] updated README.me --- README.md | 19 ++++++++++++------- 1 file changed, 12 insertions(+), 7 deletions(-) diff --git a/README.md b/README.md index fbc6de7..5c76bae 100644 --- a/README.md +++ b/README.md @@ -1,25 +1,30 @@ +TODO --- -uh so, yeah, wei dunno, wei couldn't even fiure out how to make flakes and home manager and w/e else work with GNOME, -so instead wei are jumping into a tiling WM because that will definitely be "easier" ... right ? ... ? - -[Hyprland](https://hyprland.org/) +> uh so, yeah, wei dunno, wei couldn't even fiure out how to make flakes and home manager and w/e else work +> with GNOME, so instead wei are jumping into a new WM/DE because that will definitely be "easier",, right? +--- --- -To Do, in order of priority +- [Hyprland](https://hyprland.org/) --- +--- + + +> To Do, in order of priority + - [ ] build ultraminimal general config **branch** - [ ] build ultraminimal hyprland **branch**, following above structure - - [ ] build ultraminimal gnome **branch**, following main structure + - [ ] build ultraminimal fallback gnome **branch**, following main structure - [ ] create new branch, merge, make default branch if: - [ ] get flake to actually build - [X] steal, i mean, uh, look at, other creature's nixos/hyprland setups (FrostPhoenix) - [ ] *fully* convert/swap/cannibalise configs to match needs/wants - - [X] build ~~minimal~~ *near complete* system-framework/scaffolding for configuration around hyprland + - [X] build ~~minimal~~ *near complete* system-framework/scaffolding for configuration around hyprland - [ ] build user configuration - [ ] select media for wallpapers, avatars, etc. - [ ] multi-user support From e1c3d582a7c40b8a9a0d812c80a7168a9300d7c5 Mon Sep 17 00:00:00 2001 From: Serenity-F Date: Fri, 5 Apr 2024 18:28:44 +1000 Subject: [PATCH 80/80] updated README.me --- README.md | 13 ++++--------- 1 file changed, 4 insertions(+), 9 deletions(-) diff --git a/README.md b/README.md index 5c76bae..e04126e 100644 --- a/README.md +++ b/README.md @@ -1,19 +1,14 @@ -TODO +To Do: --- > uh so, yeah, wei dunno, wei couldn't even fiure out how to make flakes and home manager and w/e else work > with GNOME, so instead wei are jumping into a new WM/DE because that will definitely be "easier",, right? +> - [Hyprland](https://hyprland.org/) --- ---- - -- [Hyprland](https://hyprland.org/) - ---- ---- -> To Do, in order of priority +> in order of priority - [ ] build ultraminimal general config **branch** @@ -22,7 +17,7 @@ TODO - [ ] create new branch, merge, make default branch if: - [ ] get flake to actually build - - [X] steal, i mean, uh, look at, other creature's nixos/hyprland setups (FrostPhoenix) + - [X] steal, uh wei mean, uh, look at, other creature's nixos/hyprland setups (FrostPhoenix) - [ ] *fully* convert/swap/cannibalise configs to match needs/wants - [X] build ~~minimal~~ *near complete* system-framework/scaffolding for configuration around hyprland - [ ] build user configuration