From f3b5d329420a9b4dbcda02cd8d27653bc9e1738f Mon Sep 17 00:00:00 2001 From: luxzi Date: Wed, 24 Jul 2024 19:51:43 -0400 Subject: [PATCH 001/102] base: add existing config --- LICENSE | 19 +++++++++++ README.md | 3 ++ flake.lock | 48 +++++++++++++++++++++++++++ flake.nix | 28 ++++++++++++++++ home-manager/home.nix | 14 ++++++++ home-manager/packages/git.nix | 19 +++++++++++ home-manager/packages/packages.nix | 20 +++++++++++ home-manager/packages/zsh.nix | 26 +++++++++++++++ nixos/configuration.nix | 25 ++++++++++++++ nixos/environments/plasma-wayland.nix | 14 ++++++++ nixos/hardware/audio.nix | 5 +++ nixos/hardware/fstab.nix | 14 ++++++++ nixos/hardware/hardware.nix | 13 ++++++++ nixos/hardware/intel.nix | 6 ++++ nixos/hardware/modules.nix | 13 ++++++++ nixos/hardware/network.nix | 5 +++ nixos/hardware/nvidia.nix | 13 ++++++++ nixos/misc/locale.nix | 5 +++ nixos/misc/misc.nix | 10 ++++++ nixos/misc/nixconfig.nix | 6 ++++ nixos/misc/time.nix | 5 +++ nixos/programs/dconf.nix | 5 +++ nixos/programs/gpg.nix | 8 +++++ nixos/programs/nix-ld.nix | 8 +++++ nixos/programs/programs.nix | 29 ++++++++++++++++ nixos/programs/steam.nix | 5 +++ nixos/services/boot.nix | 9 +++++ nixos/services/cups.nix | 5 +++ nixos/services/firewall.nix | 7 ++++ nixos/services/libinput.nix | 5 +++ nixos/services/networkmanager.nix | 6 ++++ nixos/services/pipewire.nix | 11 ++++++ nixos/services/services.nix | 13 ++++++++ nixos/users/luxzi.nix | 15 +++++++++ 34 files changed, 437 insertions(+) create mode 100644 LICENSE create mode 100644 README.md create mode 100644 flake.lock create mode 100644 flake.nix create mode 100644 home-manager/home.nix create mode 100644 home-manager/packages/git.nix create mode 100644 home-manager/packages/packages.nix create mode 100644 home-manager/packages/zsh.nix create mode 100644 nixos/configuration.nix create mode 100644 nixos/environments/plasma-wayland.nix create mode 100644 nixos/hardware/audio.nix create mode 100644 nixos/hardware/fstab.nix create mode 100644 nixos/hardware/hardware.nix create mode 100644 nixos/hardware/intel.nix create mode 100644 nixos/hardware/modules.nix create mode 100644 nixos/hardware/network.nix create mode 100644 nixos/hardware/nvidia.nix create mode 100644 nixos/misc/locale.nix create mode 100644 nixos/misc/misc.nix create mode 100644 nixos/misc/nixconfig.nix create mode 100644 nixos/misc/time.nix create mode 100644 nixos/programs/dconf.nix create mode 100644 nixos/programs/gpg.nix create mode 100644 nixos/programs/nix-ld.nix create mode 100644 nixos/programs/programs.nix create mode 100644 nixos/programs/steam.nix create mode 100644 nixos/services/boot.nix create mode 100644 nixos/services/cups.nix create mode 100644 nixos/services/firewall.nix create mode 100644 nixos/services/libinput.nix create mode 100644 nixos/services/networkmanager.nix create mode 100644 nixos/services/pipewire.nix create mode 100644 nixos/services/services.nix create mode 100644 nixos/users/luxzi.nix diff --git a/LICENSE b/LICENSE new file mode 100644 index 0000000..93972a0 --- /dev/null +++ b/LICENSE @@ -0,0 +1,19 @@ +Copyright (c) 2024 Luxzi + +Permission is hereby granted, free of charge, to any person obtaining a copy +of this software and associated documentation files (the "Software"), to deal +in the Software without restriction, including without limitation the rights +to use, copy, modify, merge, publish, distribute, sublicense, and/or sell +copies of the Software, and to permit persons to whom the Software is +furnished to do so, subject to the following conditions: + +The above copyright notice and this permission notice shall be included in all +copies or substantial portions of the Software. + +THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE +AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER +LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, +OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE +SOFTWARE. diff --git a/README.md b/README.md new file mode 100644 index 0000000..3f1492b --- /dev/null +++ b/README.md @@ -0,0 +1,3 @@ +# NixOS configuration files + +Configured for KDE Plasma Wayland on Nvidia. diff --git a/flake.lock b/flake.lock new file mode 100644 index 0000000..7deb4a9 --- /dev/null +++ b/flake.lock @@ -0,0 +1,48 @@ +{ + "nodes": { + "home-manager": { + "inputs": { + "nixpkgs": [ + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1721804110, + "narHash": "sha256-i4jINRazBKPqlaS+qhlP+kV/UHEq3vs5itfpblqu4ZM=", + "owner": "nix-community", + "repo": "home-manager", + "rev": "af70fc502a15d7e1e4c5a4c4fc8e06c2ec561e0c", + "type": "github" + }, + "original": { + "owner": "nix-community", + "repo": "home-manager", + "type": "github" + } + }, + "nixpkgs": { + "locked": { + "lastModified": 1721562059, + "narHash": "sha256-Tybxt65eyOARf285hMHIJ2uul8SULjFZbT9ZaEeUnP8=", + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "68c9ed8bbed9dfce253cc91560bf9043297ef2fe", + "type": "github" + }, + "original": { + "owner": "NixOS", + "ref": "nixos-unstable", + "repo": "nixpkgs", + "type": "github" + } + }, + "root": { + "inputs": { + "home-manager": "home-manager", + "nixpkgs": "nixpkgs" + } + } + }, + "root": "root", + "version": 7 +} diff --git a/flake.nix b/flake.nix new file mode 100644 index 0000000..c55fea8 --- /dev/null +++ b/flake.nix @@ -0,0 +1,28 @@ +{ + description = "Luxzi's NixOS system configuration"; + + inputs = { + nixpkgs.url = "github:NixOS/nixpkgs/nixos-unstable"; + home-manager.url = "github:nix-community/home-manager"; + home-manager.inputs.nixpkgs.follows = "nixpkgs"; + }; + + outputs = { self, nixpkgs, home-manager, ... }: + let + lib = nixpkgs.lib; + pkgs = nixpkgs.legacyPackages."x86_64-linux"; + in { + nixosConfigurations = { + nixos = lib.nixosSystem { + specialArgs = { inherit self; }; + modules = [ ./nixos/configuration.nix ]; + }; + }; + homeConfigurations = { + luxzi = home-manager.lib.homeManagerConfiguration { + inherit pkgs; + modules = [ ./home-manager/home.nix ]; + }; + }; + }; +} diff --git a/home-manager/home.nix b/home-manager/home.nix new file mode 100644 index 0000000..1499e1c --- /dev/null +++ b/home-manager/home.nix @@ -0,0 +1,14 @@ +{ config, pkgs, ... }: + +{ + imports = + [ + ./packages/packages.nix + ]; + + programs.home-manager.enable = true; + + home.username = "luxzi"; + home.homeDirectory = "/home/luxzi"; + home.stateVersion = "24.05"; +} diff --git a/home-manager/packages/git.nix b/home-manager/packages/git.nix new file mode 100644 index 0000000..8a88dd9 --- /dev/null +++ b/home-manager/packages/git.nix @@ -0,0 +1,19 @@ +{ ... }: + +{ + programs.git = { + enable = true; + userName = "luxzi"; + userEmail = "lesson085@gmail.com"; + aliases = { + pf = "push --force"; + kl = "log --show-signature"; + }; + signing = { + key = "$HOME/.ssh/luxzi"; + }; + extraConfig = { + init.defaultBranch = "main"; + }; + }; +} diff --git a/home-manager/packages/packages.nix b/home-manager/packages/packages.nix new file mode 100644 index 0000000..e44efab --- /dev/null +++ b/home-manager/packages/packages.nix @@ -0,0 +1,20 @@ +{ pkgs, ... }: + +{ + imports = + [ + ./zsh.nix + ./git.nix + ]; + + home.packages = with pkgs; [ + rustup + hyfetch + nix-output-monitor + alvr + firefox + tree + vesktop + kitty + ]; +} diff --git a/home-manager/packages/zsh.nix b/home-manager/packages/zsh.nix new file mode 100644 index 0000000..c9455d0 --- /dev/null +++ b/home-manager/packages/zsh.nix @@ -0,0 +1,26 @@ +{ ... }: + +{ + programs.zsh = { + enable = true; + enableCompletion = true; + autosuggestion.enable = true; + syntaxHighlighting.enable = true; + oh-my-zsh = { + enable = true; + plugins = [ "git" ]; + theme = "af-magic"; + }; + shellAliases = { + hm-switch = "home-manager switch --flake $HOME/.dotfiles"; + nx-switch = "sudo nixos-rebuild switch --flake $HOME/.dotfiles"; + nx-boot = "sudo nixos-rebuild boot --flake $HOME/.dotfiles"; + nx-clean = "sudo nix-collect-garbage --delete-old && nix-collect-garbage --delete-old"; + hm-clean = "home-manager remove-generations"; + gl-switch = "sudo nixos-rebuild switch --flake $HOME/.dotfiles && home-manager switch --flake $HOME/.dotfiles"; + gl-clean = "sudo nix-collect-garbage --delete-old && nix-collect-garbage --delete-old && home-manager remove-generations"; + snv = "sudo -E nvim"; + sen = "sudo -E"; + }; + }; +} diff --git a/nixos/configuration.nix b/nixos/configuration.nix new file mode 100644 index 0000000..21c024e --- /dev/null +++ b/nixos/configuration.nix @@ -0,0 +1,25 @@ +{ config, lib, pkgs, self, ... }: + +{ + imports = + [ # Include the results of the hardware scan. + ./hardware/hardware.nix + ./environments/plasma-wayland.nix + ./users/luxzi.nix + ./services/services.nix + ./programs/programs.nix + ./misc/misc.nix + ]; + + # Copy the NixOS configuration file and link it from the resulting system + # (/run/current-system/configuration.nix). This is useful in case you + # accidentally delete configuration.nix. + # system.copySystemConfiguration = true; + + # This value does NOT affect the Nixpkgs version your packages and OS are pulled from, + # so changing it will NOT upgrade your system - see https://nixos.org/manual/nixos/stable/#sec-upgrading for how + # to actually do that. + # For more information, see `man configuration.nix` or https://nixos.org/manual/nixos/stable/options#opt-system.stateVersion . + system.stateVersion = "24.05"; # Did you read the comment? +} + diff --git a/nixos/environments/plasma-wayland.nix b/nixos/environments/plasma-wayland.nix new file mode 100644 index 0000000..fb77cf1 --- /dev/null +++ b/nixos/environments/plasma-wayland.nix @@ -0,0 +1,14 @@ +{ pkgs, ... }: + +{ + services.xserver.videoDrivers = ["nvidia"]; + + services.displayManager.sddm.enable = true; + services.displayManager.sddm.wayland.enable = true; + services.desktopManager.plasma6.enable = true; + + environment.plasma6.excludePackages = with pkgs; [ + plasma-browser-integration + konsole + ]; +} diff --git a/nixos/hardware/audio.nix b/nixos/hardware/audio.nix new file mode 100644 index 0000000..82ca1fa --- /dev/null +++ b/nixos/hardware/audio.nix @@ -0,0 +1,5 @@ +{ ... }: + +{ + hardware.pulseaudio.enable = false; +} diff --git a/nixos/hardware/fstab.nix b/nixos/hardware/fstab.nix new file mode 100644 index 0000000..321df02 --- /dev/null +++ b/nixos/hardware/fstab.nix @@ -0,0 +1,14 @@ +{ ... }: + +{ + fileSystems."/" = + { device = "/dev/disk/by-uuid/6f9a4486-8f14-468f-aecb-5e0df8af2309"; + fsType = "ext4"; + }; + + fileSystems."/boot" = + { device = "/dev/disk/by-uuid/4A4B-5B94"; + fsType = "vfat"; + options = [ "fmask=0022" "dmask=0022" ]; + }; +} diff --git a/nixos/hardware/hardware.nix b/nixos/hardware/hardware.nix new file mode 100644 index 0000000..c7cd0a6 --- /dev/null +++ b/nixos/hardware/hardware.nix @@ -0,0 +1,13 @@ +{ ... }: + +{ + imports = + [ + ./modules.nix + ./fstab.nix + ./audio.nix + ./network.nix + ./intel.nix + ./nvidia.nix + ]; +} diff --git a/nixos/hardware/intel.nix b/nixos/hardware/intel.nix new file mode 100644 index 0000000..88bf59e --- /dev/null +++ b/nixos/hardware/intel.nix @@ -0,0 +1,6 @@ +{ lib, config, ... }: + +{ + nixpkgs.hostPlatform = lib.mkDefault "x86_64-linux"; + hardware.cpu.intel.updateMicrocode = lib.mkDefault config.hardware.enableRedistributableFirmware; +} diff --git a/nixos/hardware/modules.nix b/nixos/hardware/modules.nix new file mode 100644 index 0000000..1593b53 --- /dev/null +++ b/nixos/hardware/modules.nix @@ -0,0 +1,13 @@ +{ modulesPath, ... }: + +{ + imports = + [ + (modulesPath + "/installer/scan/not-detected.nix") + ]; + + boot.initrd.availableKernelModules = [ "xhci_pci" "ahci" "nvme" "usbhid" "usb_storage" "sd_mod" ]; + boot.initrd.kernelModules = [ ]; + boot.kernelModules = [ "kvm-intel" ]; + boot.extraModulePackages = [ ]; +} diff --git a/nixos/hardware/network.nix b/nixos/hardware/network.nix new file mode 100644 index 0000000..45bc069 --- /dev/null +++ b/nixos/hardware/network.nix @@ -0,0 +1,5 @@ +{ lib, ... }: + +{ + networking.useDHCP = lib.mkDefault true; +} diff --git a/nixos/hardware/nvidia.nix b/nixos/hardware/nvidia.nix new file mode 100644 index 0000000..eb1abd6 --- /dev/null +++ b/nixos/hardware/nvidia.nix @@ -0,0 +1,13 @@ +{ config, ... }: + +{ + hardware.graphics.enable = true; + hardware.nvidia = { + modesetting.enable = true; + powerManagement.enable = false; + powerManagement.finegrained = false; + open = false; + nvidiaSettings = false; + package = config.boot.kernelPackages.nvidiaPackages.stable; + }; +} diff --git a/nixos/misc/locale.nix b/nixos/misc/locale.nix new file mode 100644 index 0000000..01de88c --- /dev/null +++ b/nixos/misc/locale.nix @@ -0,0 +1,5 @@ +{ ... }: + +{ + i18n.defaultLocale = "en_US.UTF-8"; +} diff --git a/nixos/misc/misc.nix b/nixos/misc/misc.nix new file mode 100644 index 0000000..0ff1eca --- /dev/null +++ b/nixos/misc/misc.nix @@ -0,0 +1,10 @@ +{ ... }: + +{ + imports = + [ + ./time.nix + ./locale.nix + ./nixconfig.nix + ]; +} diff --git a/nixos/misc/nixconfig.nix b/nixos/misc/nixconfig.nix new file mode 100644 index 0000000..88d2b4a --- /dev/null +++ b/nixos/misc/nixconfig.nix @@ -0,0 +1,6 @@ +{ ... }: + +{ + nix.settings.experimental-features = [ "nix-command" "flakes" ]; + nixpkgs.config.allowUnfree = true; +} diff --git a/nixos/misc/time.nix b/nixos/misc/time.nix new file mode 100644 index 0000000..edf3feb --- /dev/null +++ b/nixos/misc/time.nix @@ -0,0 +1,5 @@ +{ ... }: + +{ + time.timeZone = "America/New_York"; +} diff --git a/nixos/programs/dconf.nix b/nixos/programs/dconf.nix new file mode 100644 index 0000000..11c2c3b --- /dev/null +++ b/nixos/programs/dconf.nix @@ -0,0 +1,5 @@ +{ ... }: + +{ + programs.dconf.enable = true; +} diff --git a/nixos/programs/gpg.nix b/nixos/programs/gpg.nix new file mode 100644 index 0000000..0ade0fc --- /dev/null +++ b/nixos/programs/gpg.nix @@ -0,0 +1,8 @@ +{ ... }: + +{ + programs.gnupg.agent = { + enable = true; + enableSSHSupport = true; + }; +} diff --git a/nixos/programs/nix-ld.nix b/nixos/programs/nix-ld.nix new file mode 100644 index 0000000..d178e51 --- /dev/null +++ b/nixos/programs/nix-ld.nix @@ -0,0 +1,8 @@ +{ pkgs, ... }: + +{ + programs.nix-ld = { + enable = true; + libraries = with pkgs; []; + }; +} diff --git a/nixos/programs/programs.nix b/nixos/programs/programs.nix new file mode 100644 index 0000000..65c910f --- /dev/null +++ b/nixos/programs/programs.nix @@ -0,0 +1,29 @@ +{ pkgs, ... }: + +{ + imports = + [ + ./nix-ld.nix + ./dconf.nix + ./gpg.nix + ./steam.nix + ]; + + environment.systemPackages = with pkgs; [ + wget + curl + git + neovim + fira-code-nerdfont + cmake + ninja + libgcc + gnumake + topgrade + unzip + patchelf + wl-clipboard + jdk17 + jre8 + ]; +} diff --git a/nixos/programs/steam.nix b/nixos/programs/steam.nix new file mode 100644 index 0000000..3e50e04 --- /dev/null +++ b/nixos/programs/steam.nix @@ -0,0 +1,5 @@ +{ ... }: + +{ + programs.steam.enable = true; +} diff --git a/nixos/services/boot.nix b/nixos/services/boot.nix new file mode 100644 index 0000000..8e3bb56 --- /dev/null +++ b/nixos/services/boot.nix @@ -0,0 +1,9 @@ +{ ... }: + +{ + boot.loader.systemd-boot.enable = true; + boot.loader.systemd-boot.configurationLimit = 10; + boot.loader.systemd-boot.editor = false; + boot.loader.efi.efiSysMountPoint = "/boot"; + boot.loader.efi.canTouchEfiVariables = true; +} diff --git a/nixos/services/cups.nix b/nixos/services/cups.nix new file mode 100644 index 0000000..4610bde --- /dev/null +++ b/nixos/services/cups.nix @@ -0,0 +1,5 @@ +{ ... }: + +{ + services.printing.enable = true; +} diff --git a/nixos/services/firewall.nix b/nixos/services/firewall.nix new file mode 100644 index 0000000..54168e7 --- /dev/null +++ b/nixos/services/firewall.nix @@ -0,0 +1,7 @@ +{ ... }: + +{ + networking.firewall.enable = false; + networking.firewall.allowedTCPPorts = []; + networking.firewall.allowedUDPPorts = []; +} diff --git a/nixos/services/libinput.nix b/nixos/services/libinput.nix new file mode 100644 index 0000000..4640b6d --- /dev/null +++ b/nixos/services/libinput.nix @@ -0,0 +1,5 @@ +{ ... }: + +{ + services.libinput.enable = true; +} diff --git a/nixos/services/networkmanager.nix b/nixos/services/networkmanager.nix new file mode 100644 index 0000000..55ce0e4 --- /dev/null +++ b/nixos/services/networkmanager.nix @@ -0,0 +1,6 @@ +{ ... }: + +{ + networking.hostName = "nixos"; + networking.networkmanager.enable = true; +} diff --git a/nixos/services/pipewire.nix b/nixos/services/pipewire.nix new file mode 100644 index 0000000..dcba83f --- /dev/null +++ b/nixos/services/pipewire.nix @@ -0,0 +1,11 @@ +{ ... }: + +{ + services.pipewire = { + enable = true; + audio.enable = true; + pulse.enable = true; + alsa.enable = true; + alsa.support32Bit = true; + }; +} diff --git a/nixos/services/services.nix b/nixos/services/services.nix new file mode 100644 index 0000000..25567fb --- /dev/null +++ b/nixos/services/services.nix @@ -0,0 +1,13 @@ +{ ... }: + +{ + imports = + [ + ./boot.nix + ./pipewire.nix + ./cups.nix + ./firewall.nix + ./libinput.nix + ./networkmanager.nix + ]; +} diff --git a/nixos/users/luxzi.nix b/nixos/users/luxzi.nix new file mode 100644 index 0000000..587a5d3 --- /dev/null +++ b/nixos/users/luxzi.nix @@ -0,0 +1,15 @@ +{ self, pkgs, ... }: + +{ + users.users.luxzi = { + isNormalUser = true; + extraGroups = [ "wheel" ]; # Enable ‘sudo’ for the user. + shell = pkgs.zsh; + packages = [ + self.inputs.home-manager.packages.${pkgs.system}.home-manager + ]; + }; + + environment.shells = with pkgs; [ zsh ]; + programs.zsh.enable = true; +} From 42e7823cecc8d0b2e883e255b4a3d3b4c0baeb14 Mon Sep 17 00:00:00 2001 From: luxzi Date: Wed, 24 Jul 2024 19:54:49 -0400 Subject: [PATCH 002/102] fix: git signature format --- home-manager/packages/git.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/home-manager/packages/git.nix b/home-manager/packages/git.nix index 8a88dd9..b7219a0 100644 --- a/home-manager/packages/git.nix +++ b/home-manager/packages/git.nix @@ -14,6 +14,7 @@ }; extraConfig = { init.defaultBranch = "main"; + gpg.format = "ssh"; }; }; } From 64d84b7196ed825a117f73a7b6745b084dc98aa7 Mon Sep 17 00:00:00 2001 From: luxzi Date: Wed, 24 Jul 2024 19:57:23 -0400 Subject: [PATCH 003/102] fix: enable git commit signing --- home-manager/packages/git.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/home-manager/packages/git.nix b/home-manager/packages/git.nix index b7219a0..e04a86c 100644 --- a/home-manager/packages/git.nix +++ b/home-manager/packages/git.nix @@ -10,7 +10,8 @@ kl = "log --show-signature"; }; signing = { - key = "$HOME/.ssh/luxzi"; + key = "/home/luxzi/.ssh/luxzi"; + signByDefault = true; }; extraConfig = { init.defaultBranch = "main"; From 2344798486bbe55d0169da251cd30e3e34a60872 Mon Sep 17 00:00:00 2001 From: luxzi Date: Wed, 24 Jul 2024 21:20:31 -0400 Subject: [PATCH 004/102] add: emacs --- home-manager/packages/emacs.nix | 8 ++++++++ 1 file changed, 8 insertions(+) create mode 100644 home-manager/packages/emacs.nix diff --git a/home-manager/packages/emacs.nix b/home-manager/packages/emacs.nix new file mode 100644 index 0000000..5ca3fe5 --- /dev/null +++ b/home-manager/packages/emacs.nix @@ -0,0 +1,8 @@ +{ ... }: + +{ + programs.emacs = { + enable = true; + package = pkgs.emacs; + }; +} From 5f8db78e6334dda3cc28aa59dcb684c1f04e53bd Mon Sep 17 00:00:00 2001 From: luxzi Date: Wed, 24 Jul 2024 21:21:29 -0400 Subject: [PATCH 005/102] fix: emacs --- home-manager/packages/packages.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/home-manager/packages/packages.nix b/home-manager/packages/packages.nix index e44efab..eeb7233 100644 --- a/home-manager/packages/packages.nix +++ b/home-manager/packages/packages.nix @@ -5,6 +5,7 @@ [ ./zsh.nix ./git.nix + ./emacs.nix ]; home.packages = with pkgs; [ From aa2a231d7bd6be44431e1129b39dee361f6d952f Mon Sep 17 00:00:00 2001 From: luxzi Date: Wed, 24 Jul 2024 21:23:50 -0400 Subject: [PATCH 006/102] fix(hm-pkgs): emacs --- home-manager/packages/emacs.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/home-manager/packages/emacs.nix b/home-manager/packages/emacs.nix index 5ca3fe5..865ce73 100644 --- a/home-manager/packages/emacs.nix +++ b/home-manager/packages/emacs.nix @@ -1,4 +1,4 @@ -{ ... }: +{ pkgs, ... }: { programs.emacs = { From 3a5707ddef7eb0616cf64b7c7e42853dd81c7e3a Mon Sep 17 00:00:00 2001 From: luxzi Date: Wed, 24 Jul 2024 22:58:20 -0400 Subject: [PATCH 007/102] add: python3 --- nixos/programs/programs.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/nixos/programs/programs.nix b/nixos/programs/programs.nix index 65c910f..dd340d8 100644 --- a/nixos/programs/programs.nix +++ b/nixos/programs/programs.nix @@ -25,5 +25,6 @@ wl-clipboard jdk17 jre8 + python3 ]; } From 6b6be7dc65e1a7e8561ea70213a7ab56a12cfc61 Mon Sep 17 00:00:00 2001 From: luxzi Date: Wed, 24 Jul 2024 23:11:36 -0400 Subject: [PATCH 008/102] add: clang-tools --- nixos/programs/programs.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/nixos/programs/programs.nix b/nixos/programs/programs.nix index dd340d8..43f8fcb 100644 --- a/nixos/programs/programs.nix +++ b/nixos/programs/programs.nix @@ -26,5 +26,6 @@ jdk17 jre8 python3 + clang-tools ]; } From 60982fea91f880389276498649bdca00f01a9063 Mon Sep 17 00:00:00 2001 From: luxzi Date: Wed, 24 Jul 2024 23:30:43 -0400 Subject: [PATCH 009/102] add: clang --- nixos/programs/programs.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/nixos/programs/programs.nix b/nixos/programs/programs.nix index 43f8fcb..55e5c7b 100644 --- a/nixos/programs/programs.nix +++ b/nixos/programs/programs.nix @@ -27,5 +27,6 @@ jre8 python3 clang-tools + clang ]; } From ae8f4121c04e89080836561e264672cfc88b3112 Mon Sep 17 00:00:00 2001 From: luxzi Date: Thu, 25 Jul 2024 13:08:25 -0400 Subject: [PATCH 010/102] add: prismlauncher --- home-manager/packages/packages.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/home-manager/packages/packages.nix b/home-manager/packages/packages.nix index eeb7233..023e600 100644 --- a/home-manager/packages/packages.nix +++ b/home-manager/packages/packages.nix @@ -17,5 +17,6 @@ tree vesktop kitty + prismlauncher ]; } From faa0c5aae7d5242f3744c583076ea4dac60c033f Mon Sep 17 00:00:00 2001 From: luxzi Date: Thu, 25 Jul 2024 18:58:28 -0400 Subject: [PATCH 011/102] update: README.md --- README.md | 42 ++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 42 insertions(+) diff --git a/README.md b/README.md index 3f1492b..677a68e 100644 --- a/README.md +++ b/README.md @@ -1,3 +1,45 @@ # NixOS configuration files Configured for KDE Plasma Wayland on Nvidia. + +## Customizing user settings + +To change your username or any additional user settings, you must: + +- Create `./nixos/users/.nix`, this can be copied from `luxzi.nix` in the same directory. +- Import the newly created file in './nixos/configuration.nix'. +- Edit `./home-manager/home.nix` to the corresponding username and home directory. + +## Adjusting hardware configuration + +--- + +**NOTE** + +If you use an older Nvidia graphics card, you do not need to modify `./nixos/hardware/nvidia.nix`. +Although if you use a newer Nvidia graphics card, it is advised to enable `open` to use the open-source kernel driver. + +To use AMD graphics cards: + +- Create `./nixos/hardware/amd.nix` +- Add `services.xserver.videoDrivers = [ "amdgpu" ];` + +--- + +## Deployment + +If you would like to use these configuration files as is, you can install a NixOS system by: + +- Mount and format desired filesystems (as described in the NixOS manual). +- Run the following git clone command while also making sure to replace `` with your desired username: +``` sh +git clone git@codeberg.org:luxzi/nixos /mnt/home//.dotfiles +``` +- Make any desired changes. +- Install the system with the command below, again, making sure to replace `` with your desired username: +``` sh +nixos-install --flake /mnt/home//.dotfiles +``` + +For more modified versions of this configuration, I recommend forking this repository. + From 8e9aa53998362ff8d0f17e600c48d802e5fcf0d9 Mon Sep 17 00:00:00 2001 From: luxzi Date: Thu, 25 Jul 2024 19:03:28 -0400 Subject: [PATCH 012/102] update: README.md note --- README.md | 13 ++++--------- 1 file changed, 4 insertions(+), 9 deletions(-) diff --git a/README.md b/README.md index 677a68e..d96a2b2 100644 --- a/README.md +++ b/README.md @@ -7,25 +7,20 @@ Configured for KDE Plasma Wayland on Nvidia. To change your username or any additional user settings, you must: - Create `./nixos/users/.nix`, this can be copied from `luxzi.nix` in the same directory. -- Import the newly created file in './nixos/configuration.nix'. +- Import the newly created file in `./nixos/configuration.nix`. - Edit `./home-manager/home.nix` to the corresponding username and home directory. ## Adjusting hardware configuration ---- - -**NOTE** - -If you use an older Nvidia graphics card, you do not need to modify `./nixos/hardware/nvidia.nix`. -Although if you use a newer Nvidia graphics card, it is advised to enable `open` to use the open-source kernel driver. +> [!NOTE] +> If you use an older Nvidia graphics card (i.e. before RTX 20 series), you do not need to modify `./nixos/hardware/nvidia.nix`. +> Although if you use a newer Nvidia graphics card, it is advised to enable `open` to use the open-source kernel driver. To use AMD graphics cards: - Create `./nixos/hardware/amd.nix` - Add `services.xserver.videoDrivers = [ "amdgpu" ];` ---- - ## Deployment If you would like to use these configuration files as is, you can install a NixOS system by: From 0a4f9c88da615f89b5e0aeabf489856be3f0ee35 Mon Sep 17 00:00:00 2001 From: luxzi Date: Thu, 25 Jul 2024 19:06:43 -0400 Subject: [PATCH 013/102] fix: README.md grammar mistakes --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index d96a2b2..2e54a8a 100644 --- a/README.md +++ b/README.md @@ -23,7 +23,7 @@ To use AMD graphics cards: ## Deployment -If you would like to use these configuration files as is, you can install a NixOS system by: +If you would like to use these configuration files as is: - Mount and format desired filesystems (as described in the NixOS manual). - Run the following git clone command while also making sure to replace `` with your desired username: From 2b821be96e0b341e232e5971e0485a367fc2763b Mon Sep 17 00:00:00 2001 From: luxzi Date: Fri, 26 Jul 2024 16:13:05 -0400 Subject: [PATCH 014/102] add: zplug --- home-manager/packages/packages.nix | 2 ++ home-manager/packages/zsh.nix | 41 ++++++++++++++++++++++++++---- 2 files changed, 38 insertions(+), 5 deletions(-) diff --git a/home-manager/packages/packages.nix b/home-manager/packages/packages.nix index 023e600..930f836 100644 --- a/home-manager/packages/packages.nix +++ b/home-manager/packages/packages.nix @@ -18,5 +18,7 @@ vesktop kitty prismlauncher + fzf + zoxide ]; } diff --git a/home-manager/packages/zsh.nix b/home-manager/packages/zsh.nix index c9455d0..8034166 100644 --- a/home-manager/packages/zsh.nix +++ b/home-manager/packages/zsh.nix @@ -6,11 +6,7 @@ enableCompletion = true; autosuggestion.enable = true; syntaxHighlighting.enable = true; - oh-my-zsh = { - enable = true; - plugins = [ "git" ]; - theme = "af-magic"; - }; + autocd = true; shellAliases = { hm-switch = "home-manager switch --flake $HOME/.dotfiles"; nx-switch = "sudo nixos-rebuild switch --flake $HOME/.dotfiles"; @@ -22,5 +18,40 @@ snv = "sudo -E nvim"; sen = "sudo -E"; }; + + zplug = { + enable = true; + plugins = [ + { name = "Aloxaf/fzf-tab"; } + ]; + }; + + history = { + size = 5000; + save = 5000; + ignoreAllDups = true; + ignoreDups = true; + ignoreSpace = true; + share = true; + }; + + initExtra = '' + bindkey -v + bindkey '^k' history-search-backward + bindkey '^j' history-search-forward + setopt appendHistory + zstyle ':completion:*' matcher-list 'm:{a-z}={A-Za-z}' + zstyle ':completion:*' menu no + zstyle ':fzf-tab:complete:cd:*' fzf-preview 'ls --color $realpath' + zstyle ':fzf-tab:complete:__zoxide_z:*' fzf-preview 'ls --color $realpath' + eval "$(fzf --zsh)" + eval "$(zoxide init --cmd cd zsh)" + ''; + }; + + programs.oh-my-posh = { + enable = true; + enableZshIntegration = true; + useTheme = "catppuccin_mocha"; }; } From c09f9c6194e4cd218e024d19ae7d980b6107a3e9 Mon Sep 17 00:00:00 2001 From: luxzi Date: Fri, 26 Jul 2024 17:39:20 -0400 Subject: [PATCH 015/102] conf: kitty --- home-manager/packages/kitty.nix | 11 ++++ home-manager/packages/packages.nix | 2 +- home-manager/packages/zsh.nix | 92 +++++++++++++++++++++++++++++- 3 files changed, 102 insertions(+), 3 deletions(-) create mode 100644 home-manager/packages/kitty.nix diff --git a/home-manager/packages/kitty.nix b/home-manager/packages/kitty.nix new file mode 100644 index 0000000..1af2a15 --- /dev/null +++ b/home-manager/packages/kitty.nix @@ -0,0 +1,11 @@ +{ ... }: + +{ + programs.kitty = { + enable = true; + font = "FiraCode Nerd Font"; + settings = { + window_padding_width = 4; + }; + }; +} diff --git a/home-manager/packages/packages.nix b/home-manager/packages/packages.nix index 930f836..8d0c2bd 100644 --- a/home-manager/packages/packages.nix +++ b/home-manager/packages/packages.nix @@ -6,6 +6,7 @@ ./zsh.nix ./git.nix ./emacs.nix + ./kitty.nix ]; home.packages = with pkgs; [ @@ -16,7 +17,6 @@ firefox tree vesktop - kitty prismlauncher fzf zoxide diff --git a/home-manager/packages/zsh.nix b/home-manager/packages/zsh.nix index 8034166..03d3bba 100644 --- a/home-manager/packages/zsh.nix +++ b/home-manager/packages/zsh.nix @@ -52,6 +52,94 @@ programs.oh-my-posh = { enable = true; enableZshIntegration = true; - useTheme = "catppuccin_mocha"; - }; + # useTheme = "catppuccin_mocha"; + settings = { + "$schema" = "https://raw.githubusercontent.com/JanDeDobbeleer/oh-my-posh/main/themes/schema.json"; + palette = { + os = "#ACB0BE"; + pink = "#F5BDE6"; + lavender = "#B7BDF8"; + blue = "#8AADF4"; + white = "#FFFFFF"; + text = "#494D64"; + }; + blocks = [ + { + alignment = "left"; + segments = [ + { + background = "p:blue"; + foreground = "p:wight"; + powerline_symbol = builtins.fromJSON '' "\ue0b4" ''; + leading_diamond = builtins.fromJSON '' "\ue0b6" ''; + style = "diamond"; + template = "{{.Icon}} "; + type = "os"; + } + { + background = "p:blue"; + foreground = "p:text"; + powerline_symbol = builtins.fromJSON '' "\ue0b4" ''; + style = "diamond"; + template = "{{ .UserName }}@{{ .HostName }}"; + type = "session"; + } + { + background = "p:pink"; + foreground = "p:text"; + properties = { + folder_icon = "..\ue5fe.."; + home_icon = "~"; + style = "folder"; + }; + powerline_symbol = builtins.fromJSON '' "\ue0b4" ''; + style = "powerline"; + template = builtins.fromJSON '' " \udb81\udf70 {{ .Path }}" ''; + type = "path"; + } + { + background = "p:blue"; + foreground = "p:text"; + powerline_symbol = builtins.fromJSON '' "\ue0b4" ''; + template = builtins.fromJSON '' "{{if .Env.IN_NIX_SHELL}} \uf313 in nix-shell{{else}}{{end}}" ''; + style = "diamond"; + type = "text"; + } + { + background = "p:lavender"; + foreground = "p:text"; + style = "powerline"; + properties = { + branch_icon = builtins.fromJSON '' "\ue725 " ''; + cherry_pick_icon = builtins.fromJSON '' "\ue29b " ''; + commit_icon = builtins.fromJSON '' "\uf417 " ''; + fetch_status = true; + fetch_upstream_icon = true; + fetch_bare_info = true; + merge_icon = builtins.fromJSON '' "\ue727 " ''; + no_commits_icon = builtins.fromJSON '' "\uf0c3 " ''; + rebase_icon = builtins.fromJSON '' "\ue728 " ''; + revert_icon = builtins.fromJSON '' "\uf0e2 " ''; + tag_icon = builtins.fromJSON '' "\uf412 " ''; + }; + powerline_symbol = builtins.fromJSON '' "\ue0b4" ''; + template = " {{ .HEAD }}{{ .Working }}"; + type = "git"; + } + { + background = "#f38ba8"; + foreground = "p:text"; + powerline_symbol = builtins.fromJSON '' "\ue0b4" ''; + template = builtins.fromJSON '' "{{if eq .Code 0}}{{else}} \uea87 {{.Code}}<#f38ba8,transparent>\ue0b4{{end}}" ''; + type = "status"; + style = "diamond"; + } + ]; + type = "prompt"; + } + ]; + final_space = true; + version = 2; + }; + }; } From f360eeb4b57c8d71f56ca93f1a24ff98e21982e6 Mon Sep 17 00:00:00 2001 From: luxzi Date: Fri, 26 Jul 2024 18:10:34 -0400 Subject: [PATCH 016/102] conf: zsh --- home-manager/packages/git.nix | 1 + home-manager/packages/kitty.nix | 9 +++++++-- home-manager/packages/zsh.nix | 5 +++-- 3 files changed, 11 insertions(+), 4 deletions(-) diff --git a/home-manager/packages/git.nix b/home-manager/packages/git.nix index e04a86c..443166f 100644 --- a/home-manager/packages/git.nix +++ b/home-manager/packages/git.nix @@ -16,6 +16,7 @@ extraConfig = { init.defaultBranch = "main"; gpg.format = "ssh"; + core.symlinks = true; }; }; } diff --git a/home-manager/packages/kitty.nix b/home-manager/packages/kitty.nix index 1af2a15..cb0d531 100644 --- a/home-manager/packages/kitty.nix +++ b/home-manager/packages/kitty.nix @@ -1,9 +1,14 @@ -{ ... }: +{ pkgs, ... }: { programs.kitty = { enable = true; - font = "FiraCode Nerd Font"; + theme = "Catppuccin-Mocha"; + font = { + name = "FiraCode Nerd Font"; + package = pkgs.fira-code-nerdfont; + size = 14; + }; settings = { window_padding_width = 4; }; diff --git a/home-manager/packages/zsh.nix b/home-manager/packages/zsh.nix index 03d3bba..8024214 100644 --- a/home-manager/packages/zsh.nix +++ b/home-manager/packages/zsh.nix @@ -52,7 +52,6 @@ programs.oh-my-posh = { enable = true; enableZshIntegration = true; - # useTheme = "catppuccin_mocha"; settings = { "$schema" = "https://raw.githubusercontent.com/JanDeDobbeleer/oh-my-posh/main/themes/schema.json"; palette = { @@ -63,13 +62,15 @@ white = "#FFFFFF"; text = "#494D64"; }; + console_title_template = "{{.Folder}}{{if .Root}} :: root{{end}} :: {{.Shell}}"; blocks = [ { alignment = "left"; + newline = true; segments = [ { background = "p:blue"; - foreground = "p:wight"; + foreground = "p:white"; powerline_symbol = builtins.fromJSON '' "\ue0b4" ''; leading_diamond = builtins.fromJSON '' "\ue0b6" ''; style = "diamond"; From ca3a0e26054af7e17fd721e4531cdde7c14cd9ec Mon Sep 17 00:00:00 2001 From: luxzi Date: Fri, 26 Jul 2024 18:55:27 -0400 Subject: [PATCH 017/102] conf: doom-emacs --- .gitmodules | 3 + .../packages/doom-emacs/.doom.d/config.el | 100 +++++++++ .../packages/doom-emacs/.doom.d/custom.el | 13 ++ .../packages/doom-emacs/.doom.d/init.el | 191 ++++++++++++++++++ .../packages/doom-emacs/.doom.d/packages.el | 53 +++++ home-manager/packages/doom-emacs/.emacs.d | 1 + home-manager/packages/doom-emacs/.gitignore | 2 + home-manager/packages/emacs.nix | 5 + 8 files changed, 368 insertions(+) create mode 100644 .gitmodules create mode 100644 home-manager/packages/doom-emacs/.doom.d/config.el create mode 100644 home-manager/packages/doom-emacs/.doom.d/custom.el create mode 100644 home-manager/packages/doom-emacs/.doom.d/init.el create mode 100644 home-manager/packages/doom-emacs/.doom.d/packages.el create mode 160000 home-manager/packages/doom-emacs/.emacs.d create mode 100644 home-manager/packages/doom-emacs/.gitignore diff --git a/.gitmodules b/.gitmodules new file mode 100644 index 0000000..78080c7 --- /dev/null +++ b/.gitmodules @@ -0,0 +1,3 @@ +[submodule "home-manager/packages/doom-emacs/.emacs.d"] + path = home-manager/packages/doom-emacs/.emacs.d + url = https://github.com/doomemacs/doomemacs diff --git a/home-manager/packages/doom-emacs/.doom.d/config.el b/home-manager/packages/doom-emacs/.doom.d/config.el new file mode 100644 index 0000000..4c986e7 --- /dev/null +++ b/home-manager/packages/doom-emacs/.doom.d/config.el @@ -0,0 +1,100 @@ +;;; $DOOMDIR/config.el -*- lexical-binding: t; -*- + +;; Place your private configuration here! Remember, you do not need to run 'doom +;; sync' after modifying this file! + + +;; Some functionality uses this to identify you, e.g. GPG configuration, email +;; clients, file templates and snippets. It is optional. +;; (setq user-full-name "John Doe" +;; user-mail-address "john@doe.com") + +;; Doom exposes five (optional) variables for controlling fonts in Doom: +;; +;; - `doom-font' -- the primary font to use +;; - `doom-variable-pitch-font' -- a non-monospace font (where applicable) +;; - `doom-big-font' -- used for `doom-big-font-mode'; use this for +;; presentations or streaming. +;; - `doom-symbol-font' -- for symbols +;; - `doom-serif-font' -- for the `fixed-pitch-serif' face +;; +;; See 'C-h v doom-font' for documentation and more examples of what they +;; accept. For example: +;; +(setq doom-font (font-spec :family "FiraCode Nerd Font" :size 12 :weight 'semi-light) + doom-variable-pitch-font (font-spec :family "Liberation Sans" :size 13)) +;; +;; If you or Emacs can't find your font, use 'M-x describe-font' to look them +;; up, `M-x eval-region' to execute elisp code, and 'M-x doom/reload-font' to +;; refresh your font settings. If Emacs still can't find your font, it likely +;; wasn't installed correctly. Font issues are rarely Doom issues! + +;; There are two ways to load a theme. Both assume the theme is installed and +;; available. You can either set `doom-theme' or manually load a theme with the +;; `load-theme' function. This is the default: +(setq doom-theme 'catppuccin) + +;; This determines the style of line numbers in effect. If set to `nil', line +;; numbers are disabled. For relative line numbers, set this to `relative'. +(setq display-line-numbers-type 'relative) + +;; Modeline config +(setq doom-modeline-height 28) +(setq doom-modeline-modal t) +(setq doom-modeline-modal-icon t) +(setq doom-modeline-modal-modern-icon nil) +(setq doom-modeline-enable-word-count nil) +(setq doom-modeline-total-line-number t) +(setq doom-modeline-buffer-file-name-style 'truncate-with-project) +(setq doom-modeline-persp-name t) +(setq doom-modeline-persp-icon t) +(setq doom-modeline-major-mode-icon t) +(setq doom-modeline-major-mode-color-icon t) +(setq doom-modeline-buffer-state-icon t) +(setq doom-modeline-buffer-modification-icon t) +(setq doom-modeline-lsp-icon t) +(setq doom-modeline-always-show-macro-register t) +(setq doom-modeline-time t) +(setq doom-modeline-time-icon t) + +;; If you use `org' and don't want your org files in the default location below, +;; change `org-directory'. It must be set before org loads! +(setq org-directory "~/org/") + +(setq pixel-scroll-precision-large-scroll-height 40) +(setq pixel-scroll-precision-mode 1) +(setq catppuccin-flavor 'mocha) + +(setq evil-want-integration t) + +;; Whenever you reconfigure a package, make sure to wrap your config in an +;; `after!' block, otherwise Doom's defaults may override your settings. E.g. +;; +;; (after! PACKAGE +;; (setq x y)) +;; +;; The exceptions to this rule: +;; +;; - Setting file/directory variables (like `org-directory') +;; - Setting variables which explicitly tell you to set them before their +;; package is loaded (see 'C-h v VARIABLE' to look up their documentation). +;; - Setting doom variables (which start with 'doom-' or '+'). +;; +;; Here are some additional functions/macros that will help you configure Doom. +;; +;; - `load!' for loading external *.el files relative to this one +;; - `use-package!' for configuring packages +;; - `after!' for running code after a package has loaded +;; - `add-load-path!' for adding directories to the `load-path', relative to +;; this file. Emacs searches the `load-path' when you load packages with +;; `require' or `use-package'. +;; - `map!' for binding new keys +;; +;; To get information about any of these functions/macros, move the cursor over +;; the highlighted symbol at press 'K' (non-evil users must press 'C-c c k'). +;; This will open documentation for it, including demos of how they are used. +;; Alternatively, use `C-h o' to look up a symbol (functions, variables, faces, +;; etc). +;; +;; You can also try 'gd' (or 'C-c c d') to jump to their definition and see how +;; they are implemented. diff --git a/home-manager/packages/doom-emacs/.doom.d/custom.el b/home-manager/packages/doom-emacs/.doom.d/custom.el new file mode 100644 index 0000000..28486aa --- /dev/null +++ b/home-manager/packages/doom-emacs/.doom.d/custom.el @@ -0,0 +1,13 @@ +(custom-set-variables + ;; custom-set-variables was added by Custom. + ;; If you edit it by hand, you could mess it up, so be careful. + ;; Your init file should contain only one such instance. + ;; If there is more than one, they won't work right. + '(custom-safe-themes + '("4825b816a58680d1da5665f8776234d4aefce7908594bea75ec9d7e3dc429753" "8d3ef5ff6273f2a552152c7febc40eabca26bae05bd12bc85062e2dc224cde9a" "da75eceab6bea9298e04ce5b4b07349f8c02da305734f7c0c8c6af7b5eaa9738" "014cb63097fc7dbda3edf53eb09802237961cbb4c9e9abd705f23b86511b0a69" "d481904809c509641a1a1f1b1eb80b94c58c210145effc2631c1a7f2e4a2fdf4" "77fff78cc13a2ff41ad0a8ba2f09e8efd3c7e16be20725606c095f9a19c24d3d" "aec7b55f2a13307a55517fdf08438863d694550565dee23181d2ebd973ebd6b8" default))) +(custom-set-faces + ;; custom-set-faces was added by Custom. + ;; If you edit it by hand, you could mess it up, so be careful. + ;; Your init file should contain only one such instance. + ;; If there is more than one, they won't work right. + ) diff --git a/home-manager/packages/doom-emacs/.doom.d/init.el b/home-manager/packages/doom-emacs/.doom.d/init.el new file mode 100644 index 0000000..1d0a92e --- /dev/null +++ b/home-manager/packages/doom-emacs/.doom.d/init.el @@ -0,0 +1,191 @@ +;;; init.el -*- lexical-binding: t; -*- + +;; This file controls what Doom modules are enabled and what order they load +;; in. Remember to run 'doom sync' after modifying it! + +;; NOTE Press 'SPC h d h' (or 'C-h d h' for non-vim users) to access Doom's +;; documentation. There you'll find a link to Doom's Module Index where all +;; of our modules are listed, including what flags they support. + +;; NOTE Move your cursor over a module's name (or its flags) and press 'K' (or +;; 'C-c c k' for non-vim users) to view its documentation. This works on +;; flags as well (those symbols that start with a plus). +;; +;; Alternatively, press 'gd' (or 'C-c c d') on a module to browse its +;; directory (for easy access to its source code). + +(doom! :input + ;;bidi ; (tfel ot) thgir etirw uoy gnipleh + ;;chinese + ;;japanese + ;;layout ; auie,ctsrnm is the superior home row + + :completion + company ; the ultimate code completion backend + ;;(corfu +orderless) ; complete with cap(f), cape and a flying feather! + ;;helm ; the *other* search engine for love and life + ;;ido ; the other *other* search engine... + ;;ivy ; a search engine for love and life + vertico ; the search engine of the future + + :ui + ;;deft ; notational velocity for Emacs + doom ; what makes DOOM look the way it does + doom-dashboard ; a nifty splash screen for Emacs + ;;doom-quit ; DOOM quit-message prompts when you quit Emacs + ;;(emoji +unicode) ; 🙂 + hl-todo ; highlight TODO/FIXME/NOTE/DEPRECATED/HACK/REVIEW + ;;indent-guides ; highlighted indent columns + ;;ligatures ; ligatures and symbols to make your code pretty again + ;;minimap ; show a map of the code on the side + modeline ; snazzy, Atom-inspired modeline, plus API + ;;nav-flash ; blink cursor line after big motions + ;;neotree ; a project drawer, like NERDTree for vim + ophints ; highlight the region an operation acts on + (popup +defaults) ; tame sudden yet inevitable temporary windows + ;;tabs ; a tab bar for Emacs + treemacs ; a project drawer, like neotree but cooler + ;;unicode ; extended unicode support for various languages + (vc-gutter +pretty) ; vcs diff in the fringe + ;;vi-tilde-fringe ; fringe tildes to mark beyond EOB + ;;window-select ; visually switch windows + workspaces ; tab emulation, persistence & separate workspaces + ;;zen ; distraction-free coding or writing + + :editor + (evil +everywhere); come to the dark side, we have cookies + file-templates ; auto-snippets for empty files + fold ; (nigh) universal code folding + ;;(format +onsave) ; automated prettiness + ;;god ; run Emacs commands without modifier keys + ;;lispy ; vim for lisp, for people who don't like vim + ;;multiple-cursors ; editing in many places at once + ;;objed ; text object editing for the innocent + ;;parinfer ; turn lisp into python, sort of + ;;rotate-text ; cycle region at point between text candidates + snippets ; my elves. They type so I don't have to + word-wrap ; soft wrapping with language-aware indent + + :emacs + dired ; making dired pretty [functional] + electric ; smarter, keyword-based electric-indent + ;;ibuffer ; interactive buffer management + undo ; persistent, smarter undo for your inevitable mistakes + vc ; version-control and Emacs, sitting in a tree + + :term + ;;eshell ; the elisp shell that works everywhere + ;;shell ; simple shell REPL for Emacs + term ; basic terminal emulator for Emacs + ;;vterm ; the best terminal emulation in Emacs + + :checkers + syntax ; tasing you for every semicolon you forget + ;;(spell +flyspell) ; tasing you for misspelling mispelling + ;;grammar ; tasing grammar mistake every you make + + :tools + ;;ansible + ;;biblio ; Writes a PhD for you (citation needed) + ;;collab ; buffers with friends + ;;debugger ; FIXME stepping through code, to help you add bugs + ;;direnv + ;;docker + ;;editorconfig ; let someone else argue about tabs vs spaces + ;;ein ; tame Jupyter notebooks with emacs + (eval +overlay) ; run code, run (also, repls) + lookup ; navigate your code and its documentation + ;;lsp ; M-x vscode + magit ; a git porcelain for Emacs + ;;make ; run make tasks from Emacs + ;;pass ; password manager for nerds + ;;pdf ; pdf enhancements + ;;prodigy ; FIXME managing external services & code builders + ;;terraform ; infrastructure as code + ;;tmux ; an API for interacting with tmux + ;;tree-sitter ; syntax and parsing, sitting in a tree... + ;;upload ; map local to remote projects via ssh/ftp + + :os + (:if (featurep :system 'macos) macos) ; improve compatibility with macOS + ;;tty ; improve the terminal Emacs experience + + :lang + ;;agda ; types of types of types of types... + ;;beancount ; mind the GAAP + (cc +lsp) ; C > C++ == 1 + ;;clojure ; java with a lisp + ;;common-lisp ; if you've seen one lisp, you've seen them all + ;;coq ; proofs-as-programs + ;;crystal ; ruby at the speed of c + ;;csharp ; unity, .NET, and mono shenanigans + ;;data ; config/data formats + ;;(dart +flutter) ; paint ui and not much else + ;;dhall + ;;elixir ; erlang done right + ;;elm ; care for a cup of TEA? + emacs-lisp ; drown in parentheses + ;;erlang ; an elegant language for a more civilized age + ;;ess ; emacs speaks statistics + ;;factor + ;;faust ; dsp, but you get to keep your soul + ;;fortran ; in FORTRAN, GOD is REAL (unless declared INTEGER) + ;;fsharp ; ML stands for Microsoft's Language + ;;fstar ; (dependent) types and (monadic) effects and Z3 + ;;gdscript ; the language you waited for + ;;(go +lsp) ; the hipster dialect + ;;(graphql +lsp) ; Give queries a REST + ;;(haskell +lsp) ; a language that's lazier than I am + ;;hy ; readability of scheme w/ speed of python + ;;idris ; a language you can depend on + ;;json ; At least it ain't XML + ;;(java +lsp) ; the poster child for carpal tunnel syndrome + ;;javascript ; all(hope(abandon(ye(who(enter(here)))))) + ;;julia ; a better, faster MATLAB + ;;kotlin ; a better, slicker Java(Script) + latex ; writing papers in Emacs has never been so fun + ;;lean ; for folks with too much to prove + ;;ledger ; be audit you can be + ;;lua ; one-based indices? one-based indices + markdown ; writing docs for people to ignore + ;;nim ; python + lisp at the speed of c + nix ; I hereby declare "nix geht mehr!" + ;;ocaml ; an objective camel + org ; organize your plain life in plain text + ;;php ; perl's insecure younger brother + ;;plantuml ; diagrams for confusing people more + ;;purescript ; javascript, but functional + python ; beautiful is better than ugly + ;;qt ; the 'cutest' gui framework ever + ;;racket ; a DSL for DSLs + ;;raku ; the artist formerly known as perl6 + ;;rest ; Emacs as a REST client + ;;rst ; ReST in peace + ;;(ruby +rails) ; 1.step {|i| p "Ruby is #{i.even? ? 'love' : 'life'}"} + (rust +lsp) ; Fe2O3.unwrap().unwrap().unwrap().unwrap() + ;;scala ; java, but good + ;;(scheme +guile) ; a fully conniving family of lisps + sh ; she sells {ba,z,fi}sh shells on the C xor + ;;sml + ;;solidity ; do you need a blockchain? No. + ;;swift ; who asked for emoji variables? + ;;terra ; Earth and Moon in alignment for performance. + ;;web ; the tubes + ;;yaml ; JSON, but readable + ;;zig ; C, but simpler + + :email + ;;(mu4e +org +gmail) + ;;notmuch + ;;(wanderlust +gmail) + + :app + ;;calendar + ;;emms + ;;everywhere ; *leave* Emacs!? You must be joking + ;;irc ; how neckbeards socialize + ;;(rss +org) ; emacs as an RSS reader + + :config + ;;literate + (default +bindings +smartparens)) diff --git a/home-manager/packages/doom-emacs/.doom.d/packages.el b/home-manager/packages/doom-emacs/.doom.d/packages.el new file mode 100644 index 0000000..9f208c1 --- /dev/null +++ b/home-manager/packages/doom-emacs/.doom.d/packages.el @@ -0,0 +1,53 @@ +;; -*- no-byte-compile: t; -*- +;;; $DOOMDIR/packages.el + +;; To install a package with Doom you must declare them here and run 'doom sync' +;; on the command line, then restart Emacs for the changes to take effect -- or +;; use 'M-x doom/reload'. + + +;; To install SOME-PACKAGE from MELPA, ELPA or emacsmirror: +;; (package! some-package) + +;; To install a package directly from a remote git repo, you must specify a +;; `:recipe'. You'll find documentation on what `:recipe' accepts here: +;; https://github.com/radian-software/straight.el#the-recipe-format +;; (package! another-package +;; :recipe (:host github :repo "username/repo")) + +;; If the package you are trying to install does not contain a PACKAGENAME.el +;; file, or is located in a subdirectory of the repo, you'll need to specify +;; `:files' in the `:recipe': +;; (package! this-package +;; :recipe (:host github :repo "username/repo" +;; :files ("some-file.el" "src/lisp/*.el"))) + +;; If you'd like to disable a package included with Doom, you can do so here +;; with the `:disable' property: +;; (package! builtin-package :disable t) + +;; You can override the recipe of a built in package without having to specify +;; all the properties for `:recipe'. These will inherit the rest of its recipe +;; from Doom or MELPA/ELPA/Emacsmirror: +;; (package! builtin-package :recipe (:nonrecursive t)) +;; (package! builtin-package-2 :recipe (:repo "myfork/package")) + +;; Specify a `:branch' to install a package from a particular branch or tag. +;; This is required for some packages whose default branch isn't 'master' (which +;; our package manager can't deal with; see radian-software/straight.el#279) +;; (package! builtin-package :recipe (:branch "develop")) + +;; Use `:pin' to specify a particular commit to install. +;; (package! builtin-package :pin "1a2b3c4d5e") + + +;; Doom's packages are pinned to a specific commit and updated from release to +;; release. The `unpin!' macro allows you to unpin single packages... +;; (unpin! pinned-package) +;; ...or multiple packages +;; (unpin! pinned-package another-pinned-package) +;; ...Or *all* packages (NOT RECOMMENDED; will likely break things) +;; (unpin! t) + +(package! elcord) +(package! catppuccin-theme) diff --git a/home-manager/packages/doom-emacs/.emacs.d b/home-manager/packages/doom-emacs/.emacs.d new file mode 160000 index 0000000..f5b3958 --- /dev/null +++ b/home-manager/packages/doom-emacs/.emacs.d @@ -0,0 +1 @@ +Subproject commit f5b3958331cebf66383bf22bdc8b61cd44eca645 diff --git a/home-manager/packages/doom-emacs/.gitignore b/home-manager/packages/doom-emacs/.gitignore new file mode 100644 index 0000000..ab9d44b --- /dev/null +++ b/home-manager/packages/doom-emacs/.gitignore @@ -0,0 +1,2 @@ +!.doom.d/ +!.emacs.d/ diff --git a/home-manager/packages/emacs.nix b/home-manager/packages/emacs.nix index 865ce73..17eaa89 100644 --- a/home-manager/packages/emacs.nix +++ b/home-manager/packages/emacs.nix @@ -5,4 +5,9 @@ enable = true; package = pkgs.emacs; }; + + # environment.variables = { + # # Point Emacs to the source controlled configuration files. + # EMACSLOADPATH = builtins.getEnv "HOME" + "/.dotfiles/home-manager/packages/doom-emacs"; + # }; } From 0389a2e88ca8e3d217cd5b492a7f66beada4144b Mon Sep 17 00:00:00 2001 From: luxzi Date: Fri, 26 Jul 2024 19:15:03 -0400 Subject: [PATCH 018/102] conf: doom-emacs dynamic --- home-manager/packages/doom-emacs/.emacs.d | 1 - home-manager/packages/doom-emacs/.gitignore | 1 - 2 files changed, 2 deletions(-) delete mode 160000 home-manager/packages/doom-emacs/.emacs.d diff --git a/home-manager/packages/doom-emacs/.emacs.d b/home-manager/packages/doom-emacs/.emacs.d deleted file mode 160000 index f5b3958..0000000 --- a/home-manager/packages/doom-emacs/.emacs.d +++ /dev/null @@ -1 +0,0 @@ -Subproject commit f5b3958331cebf66383bf22bdc8b61cd44eca645 diff --git a/home-manager/packages/doom-emacs/.gitignore b/home-manager/packages/doom-emacs/.gitignore index ab9d44b..6daab5a 100644 --- a/home-manager/packages/doom-emacs/.gitignore +++ b/home-manager/packages/doom-emacs/.gitignore @@ -1,2 +1 @@ !.doom.d/ -!.emacs.d/ From 483d58b3e552f315706ad0db8e2202c83c023372 Mon Sep 17 00:00:00 2001 From: luxzi Date: Fri, 26 Jul 2024 19:16:34 -0400 Subject: [PATCH 019/102] conf: doom-emacs dynamically --- home-manager/packages/emacs.nix | 19 ++++++++++++++----- 1 file changed, 14 insertions(+), 5 deletions(-) diff --git a/home-manager/packages/emacs.nix b/home-manager/packages/emacs.nix index 17eaa89..8d0b8ca 100644 --- a/home-manager/packages/emacs.nix +++ b/home-manager/packages/emacs.nix @@ -1,4 +1,4 @@ -{ pkgs, ... }: +{ pkgs, config, lib, ... }: { programs.emacs = { @@ -6,8 +6,17 @@ package = pkgs.emacs; }; - # environment.variables = { - # # Point Emacs to the source controlled configuration files. - # EMACSLOADPATH = builtins.getEnv "HOME" + "/.dotfiles/home-manager/packages/doom-emacs"; - # }; + home.activation = { + cloneDoomEmacs = '' + if [ ! -d "$HOME/.emacs.d" ]; then + ${pkgs.git}/bin/git clone https://github.com/doomemacs/doomemacs $HOME/.emacs.d + fi + ''; + }; + + home.file.".doom.d" = { + source = ./doom-emacs/.doom.d; + recursive = true; + onChange = builtins.getEnv "HOME" + "/.emacs.d/bin/doom sync"; + }; } From 77c426487d0e241739fdb18299054db17e5053c9 Mon Sep 17 00:00:00 2001 From: luxzi Date: Fri, 26 Jul 2024 19:23:06 -0400 Subject: [PATCH 020/102] add: zsh emacs-config alias --- home-manager/packages/zsh.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/home-manager/packages/zsh.nix b/home-manager/packages/zsh.nix index 8024214..d97aa2d 100644 --- a/home-manager/packages/zsh.nix +++ b/home-manager/packages/zsh.nix @@ -17,6 +17,7 @@ gl-clean = "sudo nix-collect-garbage --delete-old && nix-collect-garbage --delete-old && home-manager remove-generations"; snv = "sudo -E nvim"; sen = "sudo -E"; + emacs-config = "emacs --chdir $HOME/.doom.d &"; }; zplug = { From 6614941d6cac61bd7c2e10fa5a95424434c6e1b4 Mon Sep 17 00:00:00 2001 From: luxzi Date: Fri, 26 Jul 2024 19:30:46 -0400 Subject: [PATCH 021/102] rm: unneeded modules --- .gitmodules | 3 --- 1 file changed, 3 deletions(-) delete mode 100644 .gitmodules diff --git a/.gitmodules b/.gitmodules deleted file mode 100644 index 78080c7..0000000 --- a/.gitmodules +++ /dev/null @@ -1,3 +0,0 @@ -[submodule "home-manager/packages/doom-emacs/.emacs.d"] - path = home-manager/packages/doom-emacs/.emacs.d - url = https://github.com/doomemacs/doomemacs From d60153a7bcc847eea6a65c06de945b084d37122c Mon Sep 17 00:00:00 2001 From: luxzi Date: Fri, 26 Jul 2024 19:56:45 -0400 Subject: [PATCH 022/102] fix: impure home directory reference --- home-manager/packages/emacs.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/home-manager/packages/emacs.nix b/home-manager/packages/emacs.nix index 8d0b8ca..93f1c1c 100644 --- a/home-manager/packages/emacs.nix +++ b/home-manager/packages/emacs.nix @@ -17,6 +17,6 @@ home.file.".doom.d" = { source = ./doom-emacs/.doom.d; recursive = true; - onChange = builtins.getEnv "HOME" + "/.emacs.d/bin/doom sync"; + onChange = "${config.home.homeDirectory}/.emacs.d/bin/doom sync"; }; } From f39a57844ccd3862e5d0f768249343079604d4e6 Mon Sep 17 00:00:00 2001 From: luxzi Date: Sat, 27 Jul 2024 13:37:01 -0400 Subject: [PATCH 023/102] fix: emacs term --- home-manager/packages/emacs.nix | 1 + home-manager/packages/zsh.nix | 2 +- nixos/programs/programs.nix | 2 ++ 3 files changed, 4 insertions(+), 1 deletion(-) diff --git a/home-manager/packages/emacs.nix b/home-manager/packages/emacs.nix index 93f1c1c..6d1e57d 100644 --- a/home-manager/packages/emacs.nix +++ b/home-manager/packages/emacs.nix @@ -18,5 +18,6 @@ source = ./doom-emacs/.doom.d; recursive = true; onChange = "${config.home.homeDirectory}/.emacs.d/bin/doom sync"; + force = true; }; } diff --git a/home-manager/packages/zsh.nix b/home-manager/packages/zsh.nix index d97aa2d..f52f59c 100644 --- a/home-manager/packages/zsh.nix +++ b/home-manager/packages/zsh.nix @@ -17,7 +17,7 @@ gl-clean = "sudo nix-collect-garbage --delete-old && nix-collect-garbage --delete-old && home-manager remove-generations"; snv = "sudo -E nvim"; sen = "sudo -E"; - emacs-config = "emacs --chdir $HOME/.doom.d &"; + emacs-config = "emacs --chdir $HOME/.dotfiles/home-manager/packages/doom-emacs/.doom.d &"; }; zplug = { diff --git a/nixos/programs/programs.nix b/nixos/programs/programs.nix index 55e5c7b..048ddc9 100644 --- a/nixos/programs/programs.nix +++ b/nixos/programs/programs.nix @@ -28,5 +28,7 @@ python3 clang-tools clang + libtool + libvterm ]; } From b0528bdf59f39c8c87409144e06e32e2b53cc472 Mon Sep 17 00:00:00 2001 From: luxzi Date: Sat, 27 Jul 2024 14:02:12 -0400 Subject: [PATCH 024/102] fix: emacs font --- home-manager/packages/doom-emacs/.doom.d/config.el | 2 +- home-manager/packages/zsh.nix | 1 - 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/home-manager/packages/doom-emacs/.doom.d/config.el b/home-manager/packages/doom-emacs/.doom.d/config.el index 4c986e7..136cbf3 100644 --- a/home-manager/packages/doom-emacs/.doom.d/config.el +++ b/home-manager/packages/doom-emacs/.doom.d/config.el @@ -21,7 +21,7 @@ ;; See 'C-h v doom-font' for documentation and more examples of what they ;; accept. For example: ;; -(setq doom-font (font-spec :family "FiraCode Nerd Font" :size 12 :weight 'semi-light) +(setq doom-font (font-spec :family "FiraCodeNF" :size 12 :weight 'semi-light) doom-variable-pitch-font (font-spec :family "Liberation Sans" :size 13)) ;; ;; If you or Emacs can't find your font, use 'M-x describe-font' to look them diff --git a/home-manager/packages/zsh.nix b/home-manager/packages/zsh.nix index f52f59c..7fb3a98 100644 --- a/home-manager/packages/zsh.nix +++ b/home-manager/packages/zsh.nix @@ -63,7 +63,6 @@ white = "#FFFFFF"; text = "#494D64"; }; - console_title_template = "{{.Folder}}{{if .Root}} :: root{{end}} :: {{.Shell}}"; blocks = [ { alignment = "left"; From 4f1868dbe6977b12621e790e202e693f12cdf5e8 Mon Sep 17 00:00:00 2001 From: luxzi Date: Sat, 27 Jul 2024 21:08:17 -0400 Subject: [PATCH 025/102] add(emacs): org-superstar, org-view-mode --- home-manager/packages/doom-emacs/.doom.d/config.el | 2 +- home-manager/packages/doom-emacs/.doom.d/packages.el | 5 +++++ 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/home-manager/packages/doom-emacs/.doom.d/config.el b/home-manager/packages/doom-emacs/.doom.d/config.el index 136cbf3..4c986e7 100644 --- a/home-manager/packages/doom-emacs/.doom.d/config.el +++ b/home-manager/packages/doom-emacs/.doom.d/config.el @@ -21,7 +21,7 @@ ;; See 'C-h v doom-font' for documentation and more examples of what they ;; accept. For example: ;; -(setq doom-font (font-spec :family "FiraCodeNF" :size 12 :weight 'semi-light) +(setq doom-font (font-spec :family "FiraCode Nerd Font" :size 12 :weight 'semi-light) doom-variable-pitch-font (font-spec :family "Liberation Sans" :size 13)) ;; ;; If you or Emacs can't find your font, use 'M-x describe-font' to look them diff --git a/home-manager/packages/doom-emacs/.doom.d/packages.el b/home-manager/packages/doom-emacs/.doom.d/packages.el index 9f208c1..4fe7293 100644 --- a/home-manager/packages/doom-emacs/.doom.d/packages.el +++ b/home-manager/packages/doom-emacs/.doom.d/packages.el @@ -51,3 +51,8 @@ (package! elcord) (package! catppuccin-theme) +(package! org-view-mode) +(package! org-superstar) +(add-hook 'org-mode-hook + (lambda () + (org-superstar-mode 1))) From 65690b4e80532fbe965c8c3b590851c3a85ba1ba Mon Sep 17 00:00:00 2001 From: luxzi Date: Sun, 28 Jul 2024 15:46:10 -0400 Subject: [PATCH 026/102] add: bootstrap script --- bootstrap.sh | 5 +++++ 1 file changed, 5 insertions(+) create mode 100644 bootstrap.sh diff --git a/bootstrap.sh b/bootstrap.sh new file mode 100644 index 0000000..09296e2 --- /dev/null +++ b/bootstrap.sh @@ -0,0 +1,5 @@ +#!/bin/sh + +nix-channel --add https://nixos.org/channels/nixos-unstable nixos +nixos-rebuild switch --upgrade +nixos-install --flake /mnt/home/luxzi/.dotfiles From 8956c6fd0e7154c388af12d3e1397d79149c987e Mon Sep 17 00:00:00 2001 From: luxzi Date: Sun, 28 Jul 2024 20:20:19 -0400 Subject: [PATCH 027/102] fix(emacs): lsp --- home-manager/packages/doom-emacs/.doom.d/init.el | 2 +- home-manager/packages/doom-emacs/.doom.d/packages.el | 3 +++ 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/home-manager/packages/doom-emacs/.doom.d/init.el b/home-manager/packages/doom-emacs/.doom.d/init.el index 1d0a92e..0f20021 100644 --- a/home-manager/packages/doom-emacs/.doom.d/init.el +++ b/home-manager/packages/doom-emacs/.doom.d/init.el @@ -95,7 +95,7 @@ ;;ein ; tame Jupyter notebooks with emacs (eval +overlay) ; run code, run (also, repls) lookup ; navigate your code and its documentation - ;;lsp ; M-x vscode + lsp ; M-x vscode magit ; a git porcelain for Emacs ;;make ; run make tasks from Emacs ;;pass ; password manager for nerds diff --git a/home-manager/packages/doom-emacs/.doom.d/packages.el b/home-manager/packages/doom-emacs/.doom.d/packages.el index 4fe7293..0a8937b 100644 --- a/home-manager/packages/doom-emacs/.doom.d/packages.el +++ b/home-manager/packages/doom-emacs/.doom.d/packages.el @@ -53,6 +53,9 @@ (package! catppuccin-theme) (package! org-view-mode) (package! org-superstar) +(package! lsp-ui) + +(setq lsp-log-io t) (add-hook 'org-mode-hook (lambda () (org-superstar-mode 1))) From 3336ae2d992412157aee992501dd5ddb05508f79 Mon Sep 17 00:00:00 2001 From: luxzi Date: Mon, 29 Jul 2024 15:07:16 -0400 Subject: [PATCH 028/102] add(emacs): svelte lsp --- home-manager/packages/doom-emacs/.doom.d/packages.el | 1 + 1 file changed, 1 insertion(+) diff --git a/home-manager/packages/doom-emacs/.doom.d/packages.el b/home-manager/packages/doom-emacs/.doom.d/packages.el index 0a8937b..21c629a 100644 --- a/home-manager/packages/doom-emacs/.doom.d/packages.el +++ b/home-manager/packages/doom-emacs/.doom.d/packages.el @@ -54,6 +54,7 @@ (package! org-view-mode) (package! org-superstar) (package! lsp-ui) +(package! svelte-mode) (setq lsp-log-io t) (add-hook 'org-mode-hook From 1671764716823a5e0bcd10add874cd2be9870849 Mon Sep 17 00:00:00 2001 From: luxzi Date: Mon, 29 Jul 2024 15:35:15 -0400 Subject: [PATCH 029/102] add(emacs): typescript lsp --- home-manager/packages/doom-emacs/.doom.d/packages.el | 1 + 1 file changed, 1 insertion(+) diff --git a/home-manager/packages/doom-emacs/.doom.d/packages.el b/home-manager/packages/doom-emacs/.doom.d/packages.el index 21c629a..4047ab8 100644 --- a/home-manager/packages/doom-emacs/.doom.d/packages.el +++ b/home-manager/packages/doom-emacs/.doom.d/packages.el @@ -55,6 +55,7 @@ (package! org-superstar) (package! lsp-ui) (package! svelte-mode) +(package! typescript-mode) (setq lsp-log-io t) (add-hook 'org-mode-hook From 4ca5a54a010ca81d4094981aa0110631726ccd70 Mon Sep 17 00:00:00 2001 From: luxzi Date: Tue, 30 Jul 2024 23:25:18 -0400 Subject: [PATCH 030/102] add: tor browser --- home-manager/packages/packages.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/home-manager/packages/packages.nix b/home-manager/packages/packages.nix index 8d0c2bd..06c3b4c 100644 --- a/home-manager/packages/packages.nix +++ b/home-manager/packages/packages.nix @@ -20,5 +20,6 @@ prismlauncher fzf zoxide + tor-browser ]; } From 138203e0d6a8cef839845fcde67e2ec125dd9c40 Mon Sep 17 00:00:00 2001 From: luxzi Date: Wed, 31 Jul 2024 18:54:46 -0400 Subject: [PATCH 031/102] add: pkg-config openssl --- nixos/programs/programs.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/nixos/programs/programs.nix b/nixos/programs/programs.nix index 048ddc9..68581da 100644 --- a/nixos/programs/programs.nix +++ b/nixos/programs/programs.nix @@ -30,5 +30,7 @@ clang libtool libvterm + pkg-config + openssl ]; } From da31682d2e9bbbbbd0216d4a85ecdff6e5f11efe Mon Sep 17 00:00:00 2001 From: luxzi Date: Thu, 1 Aug 2024 18:33:11 -0400 Subject: [PATCH 032/102] add: nix-search-cli --- home-manager/packages/packages.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/home-manager/packages/packages.nix b/home-manager/packages/packages.nix index 06c3b4c..c01347b 100644 --- a/home-manager/packages/packages.nix +++ b/home-manager/packages/packages.nix @@ -21,5 +21,6 @@ fzf zoxide tor-browser + nix-search-cli ]; } From 97d282e0b50fd7919dd671ca0dd00d5f540cf4c9 Mon Sep 17 00:00:00 2001 From: luxzi Date: Thu, 1 Aug 2024 19:03:50 -0400 Subject: [PATCH 033/102] add(emacs): haskell lsp --- home-manager/packages/doom-emacs/.doom.d/init.el | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/home-manager/packages/doom-emacs/.doom.d/init.el b/home-manager/packages/doom-emacs/.doom.d/init.el index 0f20021..29f6206 100644 --- a/home-manager/packages/doom-emacs/.doom.d/init.el +++ b/home-manager/packages/doom-emacs/.doom.d/init.el @@ -135,7 +135,7 @@ ;;gdscript ; the language you waited for ;;(go +lsp) ; the hipster dialect ;;(graphql +lsp) ; Give queries a REST - ;;(haskell +lsp) ; a language that's lazier than I am + (haskell +lsp) ; a language that's lazier than I am ;;hy ; readability of scheme w/ speed of python ;;idris ; a language you can depend on ;;json ; At least it ain't XML From 4137890dae651701f6f01cf22e8ba823bcb5ed53 Mon Sep 17 00:00:00 2001 From: luxzi Date: Fri, 2 Aug 2024 16:51:16 -0400 Subject: [PATCH 034/102] add: hyprland config --- flake.lock | 16 ++ flake.nix | 8 +- home-manager/packages/hyprland/dunst.nix | 16 ++ home-manager/packages/hyprland/hyprland.nix | 143 +++++++++++++++ home-manager/packages/hyprland/hyprlock.nix | 39 +++++ home-manager/packages/hyprland/waybar.nix | 112 ++++++++++++ home-manager/packages/hyprland/wofi.nix | 185 ++++++++++++++++++++ home-manager/packages/kitty.nix | 2 + home-manager/packages/packages.nix | 3 + nixos/configuration.nix | 3 +- nixos/environments/hyprland.nix | 17 ++ 11 files changed, 540 insertions(+), 4 deletions(-) create mode 100644 home-manager/packages/hyprland/dunst.nix create mode 100644 home-manager/packages/hyprland/hyprland.nix create mode 100644 home-manager/packages/hyprland/hyprlock.nix create mode 100644 home-manager/packages/hyprland/waybar.nix create mode 100644 home-manager/packages/hyprland/wofi.nix create mode 100644 nixos/environments/hyprland.nix diff --git a/flake.lock b/flake.lock index 7deb4a9..9d35b51 100644 --- a/flake.lock +++ b/flake.lock @@ -1,5 +1,20 @@ { "nodes": { + "catppuccin": { + "locked": { + "lastModified": 1721784420, + "narHash": "sha256-bgF6fN4Qgk7NErFKGuuqWXcLORsiykTYyqMUFRiAUBY=", + "owner": "catppuccin", + "repo": "nix", + "rev": "8bdb55cc1c13f572b6e4307a3c0d64f1ae286a4f", + "type": "github" + }, + "original": { + "owner": "catppuccin", + "repo": "nix", + "type": "github" + } + }, "home-manager": { "inputs": { "nixpkgs": [ @@ -38,6 +53,7 @@ }, "root": { "inputs": { + "catppuccin": "catppuccin", "home-manager": "home-manager", "nixpkgs": "nixpkgs" } diff --git a/flake.nix b/flake.nix index c55fea8..168f604 100644 --- a/flake.nix +++ b/flake.nix @@ -5,9 +5,11 @@ nixpkgs.url = "github:NixOS/nixpkgs/nixos-unstable"; home-manager.url = "github:nix-community/home-manager"; home-manager.inputs.nixpkgs.follows = "nixpkgs"; + + catppuccin.url = "github:catppuccin/nix"; }; - outputs = { self, nixpkgs, home-manager, ... }: + outputs = { self, nixpkgs, home-manager, catppuccin, ... }: let lib = nixpkgs.lib; pkgs = nixpkgs.legacyPackages."x86_64-linux"; @@ -15,13 +17,13 @@ nixosConfigurations = { nixos = lib.nixosSystem { specialArgs = { inherit self; }; - modules = [ ./nixos/configuration.nix ]; + modules = [ ./nixos/configuration.nix catppuccin.nixosModules.catppuccin ]; }; }; homeConfigurations = { luxzi = home-manager.lib.homeManagerConfiguration { inherit pkgs; - modules = [ ./home-manager/home.nix ]; + modules = [ ./home-manager/home.nix catppuccin.homeManagerModules.catppuccin ]; }; }; }; diff --git a/home-manager/packages/hyprland/dunst.nix b/home-manager/packages/hyprland/dunst.nix new file mode 100644 index 0000000..e4c474d --- /dev/null +++ b/home-manager/packages/hyprland/dunst.nix @@ -0,0 +1,16 @@ +{ ... }: + +{ + services.dunst = { + enable = true; + catppuccin.enable = true; + settings = { + global = { + offset = "10x10"; + origin = "bottom-right"; + width = 300; + height = 500; + }; + }; + }; +} diff --git a/home-manager/packages/hyprland/hyprland.nix b/home-manager/packages/hyprland/hyprland.nix new file mode 100644 index 0000000..5f306c0 --- /dev/null +++ b/home-manager/packages/hyprland/hyprland.nix @@ -0,0 +1,143 @@ +{ pkgs, ... }: + +{ + imports = [ + ./waybar.nix + ./wofi.nix + ./dunst.nix + ./hyprlock.nix + ]; + + wayland.windowManager.hyprland = { + enable = true; + systemd.enable = true; + extraConfig = '' + # Monitors + monitor =HDMI-A-1,2560x1080@75,auto,1 + + # Autostart + exec = pkill waybar; sleep 0.5; waybar + exec = pkill swaybg; sleep 0.5; swaybg + exec = waypaper --restore + + env = LIBVA_DRIVER_NAME,nvidia + env = XDG_SESSION_TYPE,wayland + env = GBM_BACKEND,nvidia-drm + env = __GLX_VENDOR_LIBRARY_NAME,nvidia + env = NVD_BACKEND,direct + + # Input config + input { + kb_layout = us + follow_mouse = 1 + sensitivity = 0 + } + + general { + gaps_in = 5 + gaps_out = 10 + border_size = 2 + col.active_border = rgba(89b4faff) rgba(b4befeff) 45deg + col.inactive_border = rgba(45475aff) + } + + decoration { + rounding = 10 + + blur { + enabled = true + size = 15 + passes = 1 + new_optimizations = true + } + + drop_shadow = true + shadow_range = 4 + shadow_render_power = 3 + col.shadow = rgba(1e1e2ebb) + } + + animations { + enabled = true + + } + + cursor { + no_hardware_cursors = true + } + + $mainMod = SUPER + + bind = $mainMod, m, exit, + bind = $mainMod, v, togglefloating, + bind = $mainMod, q, killactive, + bind = $mainMod, s, togglesplit, + bind = $mainMod, f, fullscreen, + bind = $mainMod, p, pin, + + bind =, Print, exec, grim - | wl-copy + bind = SHIFT, Print, exec, grim -g "$(slurp)" - | wl-copy + + bind = $mainMod, r, exec, wofi --show drun --allow-images + + bind = $mainMod,Tab,cyclenext, + bind = $mainMod,Tab,bringactivetotop, + + bind = $mainMod,e,exec,hyprlock + + bind = $mainMod, h, movefocus, l + bind = $mainMod, j, movefocus, d + bind = $mainMod, k, movefocus, u + bind = $mainMod, l, movefocus, r + + 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 + + bind = $mainMod SHIFT, 1, movetoworkspace, 1 + bind = $mainMod SHIFT, 2, movetoworkspace, 2 + bind = $mainMod SHIFT, 3, movetoworkspace, 3 + bind = $mainMod SHIFT, 4, movetoworkspace, 4 + bind = $mainMod SHIFT, 5, movetoworkspace, 5 + bind = $mainMod SHIFT, 6, movetoworkspace, 6 + bind = $mainMod SHIFT, 7, movetoworkspace, 7 + bind = $mainMod SHIFT, 8, movetoworkspace, 8 + bind = $mainMod SHIFT, 9, movetoworkspace, 9 + bind = $mainMod SHIFT, 0, movetoworkspace, 10 + + bind = $mainMod, mouse_down, workspace, e+1 + bind = $mainMod, mouse_up, workspace, e-1 + + bindm = $mainMod, mouse:272, movewindow + bindm = $mainMod, mouse:273, resizewindow + bindm = ALT, mouse:272, resizewindow + ''; + }; + + home.packages = with pkgs; [ + wofi + waypaper + swaybg + waybar + pavucontrol + libsForQt5.qtstyleplugins + libsForQt5.qt5ct + kdePackages.qt6ct + kdePackages.breeze + breeze-gtk + catppuccin + grim + slurp + catppuccin-kvantum + kdePackages.qtstyleplugin-kvantum + ]; + + catppuccin.flavor = "mocha"; +} diff --git a/home-manager/packages/hyprland/hyprlock.nix b/home-manager/packages/hyprland/hyprlock.nix new file mode 100644 index 0000000..d9ce20a --- /dev/null +++ b/home-manager/packages/hyprland/hyprlock.nix @@ -0,0 +1,39 @@ +{ ... }: + +{ + programs.hyprlock = { + enable = true; + settings = { + general = { + disable_loading_bar = true; + grace = 0; + hide_cursor = true; + no_fade_in = false; + }; + + background = [ + { + path = "screenshot"; + blur_passes = 3; + blur_size = 8; + } + ]; + + input-field = [ + { + size = "200, 50"; + position = "0, -80"; + monitor = ""; + dots_center = true; + fade_on_empty = false; + font_color = "rgb(202, 211, 245)"; + inner_color = "rgb(91, 96, 120)"; + outer_color = "rgb(24, 25, 38)"; + outline_thickness = 5; + placeholder_text = ''Password...''; + shadow_passes = 2; + } + ]; + }; + }; +} diff --git a/home-manager/packages/hyprland/waybar.nix b/home-manager/packages/hyprland/waybar.nix new file mode 100644 index 0000000..c661e47 --- /dev/null +++ b/home-manager/packages/hyprland/waybar.nix @@ -0,0 +1,112 @@ +{ ... }: + +{ + programs.waybar = { + enable = true; + style = '' + * { + font-family: "FiraCode Nerd Font", sans-serif; + } + + window#waybar { + background-color: #1e1e2e; + color: #cdd6f4; + transition-property: background-color; + transition-duration: 500ms; + border: 1px solid transparent; + border-radius: 0px 0px 20px 20px; + } + + button { + box-shadow: inset 0px -3px transparent; + } + + button:hover { + background: #181825; + } + + #workspaces { + background: #1e1e2e; + } + + #workspaces button { + padding: 5px; + background-color: transparent; + color: #cdd6f4; + } + + #workspaces button:hover { + background: #181825; + } + + #workspaces button.active { + background-color: #313244; + } + + #workspaces button.urgent { + background-color: #f9e2af; + } + + #window, + #pulseaudio, + #network, + #tray, + #clock { + background-color: #1e1e2e; + color: #cdd6f4; + padding: 0px 5px 0px 5px; + } + + .modules-right { + padding-right: 10px; + } + + .modules-left { + padding-left: 10px; + } + ''; + settings = { + mainBar = { + height = 30; + width = 1920; + spacing = 4; + modules-left = [ "hyprland/workspaces" ]; + modules-center = [ "hyprland/window" ]; + modules-right = [ "tray" "pulseaudio" "network" "clock" ]; + + "hyprland/window" = { + icon = true; + format = "{initialTitle}"; + }; + + network = { + format-wifi = "{essid} ({signalStrength}%)  "; + format-ethernet = "{ipaddr}/{cidr} "; + tooltip-format = "{ifname} via {gwaddr} "; + format-linked = "{ifname} (No IP) "; + format-disconnected = "Disconnected ⚠"; + format-alt = "{ifname}: {ipaddr}/{cidr}"; + }; + + pulseaudio = { + format = "{volume}% {icon} {format_source}"; + format-bluetooth = "{volume}% {icon} {format_source}"; + format-bluetooth-muted = " {icon} {format_source}"; + format-muted = " {format_source}"; + format-source = "{volume}% "; + format-source-muted = ""; + format-icons = { + headphone = " "; + hands-free = ""; + headset = ""; + phone = ""; + portable = ""; + car = ""; + default = [ "" "" " " ]; + }; + on-click = "pavucontrol"; + }; + }; + }; + }; +} diff --git a/home-manager/packages/hyprland/wofi.nix b/home-manager/packages/hyprland/wofi.nix new file mode 100644 index 0000000..a6fcbec --- /dev/null +++ b/home-manager/packages/hyprland/wofi.nix @@ -0,0 +1,185 @@ +{ ... }: + +{ + programs.wofi = { + enable = true; + style = '' + @define-color rosewater #f5e0dc; + @define-color rosewater-rgb rgb(245, 224, 220); + @define-color flamingo #f2cdcd; + @define-color flamingo-rgb rgb(242, 205, 205); + @define-color pink #f5c2e7; + @define-color pink-rgb rgb(245, 194, 231); + @define-color mauve #cba6f7; + @define-color mauve-rgb rgb(203, 166, 247); + @define-color red #f38ba8; + @define-color red-rgb rgb(243, 139, 168); + @define-color maroon #eba0ac; + @define-color maroon-rgb rgb(235, 160, 172); + @define-color peach #fab387; + @define-color peach-rgb rgb(250, 179, 135); + @define-color yellow #f9e2af; + @define-color yellow-rgb rgb(249, 226, 175); + @define-color green #a6e3a1; + @define-color green-rgb rgb(166, 227, 161); + @define-color teal #94e2d5; + @define-color teal-rgb rgb(148, 226, 213); + @define-color sky #89dceb; + @define-color sky-rgb rgb(137, 220, 235); + @define-color sapphire #74c7ec; + @define-color sapphire-rgb rgb(116, 199, 236); + @define-color blue #89b4fa; + @define-color blue-rgb rgb(137, 180, 250); + @define-color lavender #b4befe; + @define-color lavender-rgb rgb(180, 190, 254); + @define-color text #cdd6f4; + @define-color text-rgb rgb(205, 214, 244); + @define-color subtext1 #bac2de; + @define-color subtext1-rgb rgb(186, 194, 222); + @define-color subtext0 #a6adc8; + @define-color subtext0-rgb rgb(166, 173, 200); + @define-color overlay2 #9399b2; + @define-color overlay2-rgb rgb(147, 153, 178); + @define-color overlay1 #7f849c; + @define-color overlay1-rgb rgb(127, 132, 156); + @define-color overlay0 #6c7086; + @define-color overlay0-rgb rgb(108, 112, 134); + @define-color surface2 #585b70; + @define-color surface2-rgb rgb(88, 91, 112); + @define-color surface1 #45475a; + @define-color surface1-rgb rgb(69, 71, 90); + @define-color surface0 #313244; + @define-color surface0-rgb rgb(49, 50, 68); + @define-color base #1e1e2e; + @define-color base-rgb rgb(30, 30, 46); + @define-color mantle #181825; + @define-color mantle-rgb rgb(24, 24, 37); + @define-color crust #11111b; + @define-color crust-rgb rgb(17, 17, 27); + + * { + font-family: 'FiraCode Nerd Font', monospace; + font-size: 14px; + } + + /* Window */ + window { + margin: 0px; + padding: 10px; + border: 0.16em solid @lavender; + border-radius: 20px; + background-color: @base; + 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; + border-radius: 20px; + background-color: @base; + 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; + border-radius: 20px; + background-color: @base; + } + + /* Scroll */ + #scroll { + margin: 0px; + padding: 10px; + border: none; + background-color: @base; + } + + /* Input */ + #input { + margin: 5px 20px; + padding: 10px; + border: none; + border-radius: 20px; + color: @text; + background-color: @base; + animation: fadeIn 0.5s ease-in-out both; + } + + #input image { + border: none; + color: @red; + } + + #input * { + outline: 4px solid @red!important; + } + + /* Text */ + #text { + margin: 5px; + border: none; + color: @text; + animation: fadeIn 0.5s ease-in-out both; + } + + #entry { + background-color: @base; + padding: 10px; + } + + #entry arrow { + border: none; + color: @lavender; + } + + /* Selected Entry */ + #entry:selected { + border: 0.11em solid @lavender; + border-radius: 20px; + } + + #entry:selected #text { + color: @mauve; + } + + #entry:drop(active) { + background-color: @lavender!important; + } + + ''; + settings = { + no_actions = true; + display = "grid"; + columns = 4; + rows = 3; + + }; + }; +} diff --git a/home-manager/packages/kitty.nix b/home-manager/packages/kitty.nix index cb0d531..ac34fa4 100644 --- a/home-manager/packages/kitty.nix +++ b/home-manager/packages/kitty.nix @@ -11,6 +11,8 @@ }; settings = { window_padding_width = 4; + background_opacity = "0.65"; + background_blur = 1; }; }; } diff --git a/home-manager/packages/packages.nix b/home-manager/packages/packages.nix index c01347b..57328d9 100644 --- a/home-manager/packages/packages.nix +++ b/home-manager/packages/packages.nix @@ -7,6 +7,7 @@ ./git.nix ./emacs.nix ./kitty.nix + ./hyprland/hyprland.nix ]; home.packages = with pkgs; [ @@ -22,5 +23,7 @@ zoxide tor-browser nix-search-cli + mpv + dolphin ]; } diff --git a/nixos/configuration.nix b/nixos/configuration.nix index 21c024e..c19a254 100644 --- a/nixos/configuration.nix +++ b/nixos/configuration.nix @@ -4,7 +4,8 @@ imports = [ # Include the results of the hardware scan. ./hardware/hardware.nix - ./environments/plasma-wayland.nix + # ./environments/plasma-wayland.nix + ./environments/hyprland.nix ./users/luxzi.nix ./services/services.nix ./programs/programs.nix diff --git a/nixos/environments/hyprland.nix b/nixos/environments/hyprland.nix new file mode 100644 index 0000000..7d45e1f --- /dev/null +++ b/nixos/environments/hyprland.nix @@ -0,0 +1,17 @@ +{ config, lib, pkgs, ... }: + +{ + programs.hyprland = { + enable = true; + xwayland.enable = true; + }; + + services.xserver.videoDrivers = ["nvidia"]; + services.displayManager.sddm.enable = true; + services.displayManager.sddm.wayland.enable = true; + services.displayManager.sddm.theme = "Breeze"; + + environment.variables.QT_QPA_PLATFORM = "wayland"; + environment.variables.QT_QPA_PLATFORMTHEME = "qt6ct"; + environment.variables.GTK_THEME = "Breeze"; +} From a537bf9beb4a1bd176b819889a040a7f096979f9 Mon Sep 17 00:00:00 2001 From: luxzi Date: Mon, 23 Sep 2024 23:22:39 -0400 Subject: [PATCH 035/102] dep: deprecated hyprland, added gnome --- home-manager/packages/hyprland/dunst.nix | 16 -- home-manager/packages/hyprland/hyprland.nix | 143 --------------- home-manager/packages/hyprland/hyprlock.nix | 39 ----- home-manager/packages/hyprland/waybar.nix | 112 ------------ home-manager/packages/hyprland/wofi.nix | 185 -------------------- home-manager/packages/packages.nix | 5 - nixos/configuration.nix | 2 +- nixos/environments/gnome.nix | 7 + nixos/environments/hyprland.nix | 17 -- 9 files changed, 8 insertions(+), 518 deletions(-) delete mode 100644 home-manager/packages/hyprland/dunst.nix delete mode 100644 home-manager/packages/hyprland/hyprland.nix delete mode 100644 home-manager/packages/hyprland/hyprlock.nix delete mode 100644 home-manager/packages/hyprland/waybar.nix delete mode 100644 home-manager/packages/hyprland/wofi.nix create mode 100644 nixos/environments/gnome.nix delete mode 100644 nixos/environments/hyprland.nix diff --git a/home-manager/packages/hyprland/dunst.nix b/home-manager/packages/hyprland/dunst.nix deleted file mode 100644 index e4c474d..0000000 --- a/home-manager/packages/hyprland/dunst.nix +++ /dev/null @@ -1,16 +0,0 @@ -{ ... }: - -{ - services.dunst = { - enable = true; - catppuccin.enable = true; - settings = { - global = { - offset = "10x10"; - origin = "bottom-right"; - width = 300; - height = 500; - }; - }; - }; -} diff --git a/home-manager/packages/hyprland/hyprland.nix b/home-manager/packages/hyprland/hyprland.nix deleted file mode 100644 index 5f306c0..0000000 --- a/home-manager/packages/hyprland/hyprland.nix +++ /dev/null @@ -1,143 +0,0 @@ -{ pkgs, ... }: - -{ - imports = [ - ./waybar.nix - ./wofi.nix - ./dunst.nix - ./hyprlock.nix - ]; - - wayland.windowManager.hyprland = { - enable = true; - systemd.enable = true; - extraConfig = '' - # Monitors - monitor =HDMI-A-1,2560x1080@75,auto,1 - - # Autostart - exec = pkill waybar; sleep 0.5; waybar - exec = pkill swaybg; sleep 0.5; swaybg - exec = waypaper --restore - - env = LIBVA_DRIVER_NAME,nvidia - env = XDG_SESSION_TYPE,wayland - env = GBM_BACKEND,nvidia-drm - env = __GLX_VENDOR_LIBRARY_NAME,nvidia - env = NVD_BACKEND,direct - - # Input config - input { - kb_layout = us - follow_mouse = 1 - sensitivity = 0 - } - - general { - gaps_in = 5 - gaps_out = 10 - border_size = 2 - col.active_border = rgba(89b4faff) rgba(b4befeff) 45deg - col.inactive_border = rgba(45475aff) - } - - decoration { - rounding = 10 - - blur { - enabled = true - size = 15 - passes = 1 - new_optimizations = true - } - - drop_shadow = true - shadow_range = 4 - shadow_render_power = 3 - col.shadow = rgba(1e1e2ebb) - } - - animations { - enabled = true - - } - - cursor { - no_hardware_cursors = true - } - - $mainMod = SUPER - - bind = $mainMod, m, exit, - bind = $mainMod, v, togglefloating, - bind = $mainMod, q, killactive, - bind = $mainMod, s, togglesplit, - bind = $mainMod, f, fullscreen, - bind = $mainMod, p, pin, - - bind =, Print, exec, grim - | wl-copy - bind = SHIFT, Print, exec, grim -g "$(slurp)" - | wl-copy - - bind = $mainMod, r, exec, wofi --show drun --allow-images - - bind = $mainMod,Tab,cyclenext, - bind = $mainMod,Tab,bringactivetotop, - - bind = $mainMod,e,exec,hyprlock - - bind = $mainMod, h, movefocus, l - bind = $mainMod, j, movefocus, d - bind = $mainMod, k, movefocus, u - bind = $mainMod, l, movefocus, r - - 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 - - bind = $mainMod SHIFT, 1, movetoworkspace, 1 - bind = $mainMod SHIFT, 2, movetoworkspace, 2 - bind = $mainMod SHIFT, 3, movetoworkspace, 3 - bind = $mainMod SHIFT, 4, movetoworkspace, 4 - bind = $mainMod SHIFT, 5, movetoworkspace, 5 - bind = $mainMod SHIFT, 6, movetoworkspace, 6 - bind = $mainMod SHIFT, 7, movetoworkspace, 7 - bind = $mainMod SHIFT, 8, movetoworkspace, 8 - bind = $mainMod SHIFT, 9, movetoworkspace, 9 - bind = $mainMod SHIFT, 0, movetoworkspace, 10 - - bind = $mainMod, mouse_down, workspace, e+1 - bind = $mainMod, mouse_up, workspace, e-1 - - bindm = $mainMod, mouse:272, movewindow - bindm = $mainMod, mouse:273, resizewindow - bindm = ALT, mouse:272, resizewindow - ''; - }; - - home.packages = with pkgs; [ - wofi - waypaper - swaybg - waybar - pavucontrol - libsForQt5.qtstyleplugins - libsForQt5.qt5ct - kdePackages.qt6ct - kdePackages.breeze - breeze-gtk - catppuccin - grim - slurp - catppuccin-kvantum - kdePackages.qtstyleplugin-kvantum - ]; - - catppuccin.flavor = "mocha"; -} diff --git a/home-manager/packages/hyprland/hyprlock.nix b/home-manager/packages/hyprland/hyprlock.nix deleted file mode 100644 index d9ce20a..0000000 --- a/home-manager/packages/hyprland/hyprlock.nix +++ /dev/null @@ -1,39 +0,0 @@ -{ ... }: - -{ - programs.hyprlock = { - enable = true; - settings = { - general = { - disable_loading_bar = true; - grace = 0; - hide_cursor = true; - no_fade_in = false; - }; - - background = [ - { - path = "screenshot"; - blur_passes = 3; - blur_size = 8; - } - ]; - - input-field = [ - { - size = "200, 50"; - position = "0, -80"; - monitor = ""; - dots_center = true; - fade_on_empty = false; - font_color = "rgb(202, 211, 245)"; - inner_color = "rgb(91, 96, 120)"; - outer_color = "rgb(24, 25, 38)"; - outline_thickness = 5; - placeholder_text = ''Password...''; - shadow_passes = 2; - } - ]; - }; - }; -} diff --git a/home-manager/packages/hyprland/waybar.nix b/home-manager/packages/hyprland/waybar.nix deleted file mode 100644 index c661e47..0000000 --- a/home-manager/packages/hyprland/waybar.nix +++ /dev/null @@ -1,112 +0,0 @@ -{ ... }: - -{ - programs.waybar = { - enable = true; - style = '' - * { - font-family: "FiraCode Nerd Font", sans-serif; - } - - window#waybar { - background-color: #1e1e2e; - color: #cdd6f4; - transition-property: background-color; - transition-duration: 500ms; - border: 1px solid transparent; - border-radius: 0px 0px 20px 20px; - } - - button { - box-shadow: inset 0px -3px transparent; - } - - button:hover { - background: #181825; - } - - #workspaces { - background: #1e1e2e; - } - - #workspaces button { - padding: 5px; - background-color: transparent; - color: #cdd6f4; - } - - #workspaces button:hover { - background: #181825; - } - - #workspaces button.active { - background-color: #313244; - } - - #workspaces button.urgent { - background-color: #f9e2af; - } - - #window, - #pulseaudio, - #network, - #tray, - #clock { - background-color: #1e1e2e; - color: #cdd6f4; - padding: 0px 5px 0px 5px; - } - - .modules-right { - padding-right: 10px; - } - - .modules-left { - padding-left: 10px; - } - ''; - settings = { - mainBar = { - height = 30; - width = 1920; - spacing = 4; - modules-left = [ "hyprland/workspaces" ]; - modules-center = [ "hyprland/window" ]; - modules-right = [ "tray" "pulseaudio" "network" "clock" ]; - - "hyprland/window" = { - icon = true; - format = "{initialTitle}"; - }; - - network = { - format-wifi = "{essid} ({signalStrength}%)  "; - format-ethernet = "{ipaddr}/{cidr} "; - tooltip-format = "{ifname} via {gwaddr} "; - format-linked = "{ifname} (No IP) "; - format-disconnected = "Disconnected ⚠"; - format-alt = "{ifname}: {ipaddr}/{cidr}"; - }; - - pulseaudio = { - format = "{volume}% {icon} {format_source}"; - format-bluetooth = "{volume}% {icon} {format_source}"; - format-bluetooth-muted = " {icon} {format_source}"; - format-muted = " {format_source}"; - format-source = "{volume}% "; - format-source-muted = ""; - format-icons = { - headphone = " "; - hands-free = ""; - headset = ""; - phone = ""; - portable = ""; - car = ""; - default = [ "" "" " " ]; - }; - on-click = "pavucontrol"; - }; - }; - }; - }; -} diff --git a/home-manager/packages/hyprland/wofi.nix b/home-manager/packages/hyprland/wofi.nix deleted file mode 100644 index a6fcbec..0000000 --- a/home-manager/packages/hyprland/wofi.nix +++ /dev/null @@ -1,185 +0,0 @@ -{ ... }: - -{ - programs.wofi = { - enable = true; - style = '' - @define-color rosewater #f5e0dc; - @define-color rosewater-rgb rgb(245, 224, 220); - @define-color flamingo #f2cdcd; - @define-color flamingo-rgb rgb(242, 205, 205); - @define-color pink #f5c2e7; - @define-color pink-rgb rgb(245, 194, 231); - @define-color mauve #cba6f7; - @define-color mauve-rgb rgb(203, 166, 247); - @define-color red #f38ba8; - @define-color red-rgb rgb(243, 139, 168); - @define-color maroon #eba0ac; - @define-color maroon-rgb rgb(235, 160, 172); - @define-color peach #fab387; - @define-color peach-rgb rgb(250, 179, 135); - @define-color yellow #f9e2af; - @define-color yellow-rgb rgb(249, 226, 175); - @define-color green #a6e3a1; - @define-color green-rgb rgb(166, 227, 161); - @define-color teal #94e2d5; - @define-color teal-rgb rgb(148, 226, 213); - @define-color sky #89dceb; - @define-color sky-rgb rgb(137, 220, 235); - @define-color sapphire #74c7ec; - @define-color sapphire-rgb rgb(116, 199, 236); - @define-color blue #89b4fa; - @define-color blue-rgb rgb(137, 180, 250); - @define-color lavender #b4befe; - @define-color lavender-rgb rgb(180, 190, 254); - @define-color text #cdd6f4; - @define-color text-rgb rgb(205, 214, 244); - @define-color subtext1 #bac2de; - @define-color subtext1-rgb rgb(186, 194, 222); - @define-color subtext0 #a6adc8; - @define-color subtext0-rgb rgb(166, 173, 200); - @define-color overlay2 #9399b2; - @define-color overlay2-rgb rgb(147, 153, 178); - @define-color overlay1 #7f849c; - @define-color overlay1-rgb rgb(127, 132, 156); - @define-color overlay0 #6c7086; - @define-color overlay0-rgb rgb(108, 112, 134); - @define-color surface2 #585b70; - @define-color surface2-rgb rgb(88, 91, 112); - @define-color surface1 #45475a; - @define-color surface1-rgb rgb(69, 71, 90); - @define-color surface0 #313244; - @define-color surface0-rgb rgb(49, 50, 68); - @define-color base #1e1e2e; - @define-color base-rgb rgb(30, 30, 46); - @define-color mantle #181825; - @define-color mantle-rgb rgb(24, 24, 37); - @define-color crust #11111b; - @define-color crust-rgb rgb(17, 17, 27); - - * { - font-family: 'FiraCode Nerd Font', monospace; - font-size: 14px; - } - - /* Window */ - window { - margin: 0px; - padding: 10px; - border: 0.16em solid @lavender; - border-radius: 20px; - background-color: @base; - 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; - border-radius: 20px; - background-color: @base; - 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; - border-radius: 20px; - background-color: @base; - } - - /* Scroll */ - #scroll { - margin: 0px; - padding: 10px; - border: none; - background-color: @base; - } - - /* Input */ - #input { - margin: 5px 20px; - padding: 10px; - border: none; - border-radius: 20px; - color: @text; - background-color: @base; - animation: fadeIn 0.5s ease-in-out both; - } - - #input image { - border: none; - color: @red; - } - - #input * { - outline: 4px solid @red!important; - } - - /* Text */ - #text { - margin: 5px; - border: none; - color: @text; - animation: fadeIn 0.5s ease-in-out both; - } - - #entry { - background-color: @base; - padding: 10px; - } - - #entry arrow { - border: none; - color: @lavender; - } - - /* Selected Entry */ - #entry:selected { - border: 0.11em solid @lavender; - border-radius: 20px; - } - - #entry:selected #text { - color: @mauve; - } - - #entry:drop(active) { - background-color: @lavender!important; - } - - ''; - settings = { - no_actions = true; - display = "grid"; - columns = 4; - rows = 3; - - }; - }; -} diff --git a/home-manager/packages/packages.nix b/home-manager/packages/packages.nix index 57328d9..38a387d 100644 --- a/home-manager/packages/packages.nix +++ b/home-manager/packages/packages.nix @@ -7,20 +7,15 @@ ./git.nix ./emacs.nix ./kitty.nix - ./hyprland/hyprland.nix ]; home.packages = with pkgs; [ - rustup hyfetch nix-output-monitor - alvr firefox tree vesktop - prismlauncher fzf - zoxide tor-browser nix-search-cli mpv diff --git a/nixos/configuration.nix b/nixos/configuration.nix index c19a254..918c017 100644 --- a/nixos/configuration.nix +++ b/nixos/configuration.nix @@ -5,7 +5,7 @@ [ # Include the results of the hardware scan. ./hardware/hardware.nix # ./environments/plasma-wayland.nix - ./environments/hyprland.nix + ./environments/gnome.nix ./users/luxzi.nix ./services/services.nix ./programs/programs.nix diff --git a/nixos/environments/gnome.nix b/nixos/environments/gnome.nix new file mode 100644 index 0000000..09b3483 --- /dev/null +++ b/nixos/environments/gnome.nix @@ -0,0 +1,7 @@ +{ ... }: + +{ + services.xserver.enable = false; + services.xserver.displayManager.gdm.enable = true; + services.xserver.desktopManager.gnome.enable = true; +} \ No newline at end of file diff --git a/nixos/environments/hyprland.nix b/nixos/environments/hyprland.nix deleted file mode 100644 index 7d45e1f..0000000 --- a/nixos/environments/hyprland.nix +++ /dev/null @@ -1,17 +0,0 @@ -{ config, lib, pkgs, ... }: - -{ - programs.hyprland = { - enable = true; - xwayland.enable = true; - }; - - services.xserver.videoDrivers = ["nvidia"]; - services.displayManager.sddm.enable = true; - services.displayManager.sddm.wayland.enable = true; - services.displayManager.sddm.theme = "Breeze"; - - environment.variables.QT_QPA_PLATFORM = "wayland"; - environment.variables.QT_QPA_PLATFORMTHEME = "qt6ct"; - environment.variables.GTK_THEME = "Breeze"; -} From f282b283e7e3ef5a8d8e464a6a34ae32fd9538a8 Mon Sep 17 00:00:00 2001 From: luxzi Date: Thu, 26 Sep 2024 01:24:27 -0400 Subject: [PATCH 036/102] fix: fstab, unfree software setting --- home-manager/packages/packages.nix | 6 +++++- home-manager/packages/zsh.nix | 2 -- nixos/configuration.nix | 2 ++ nixos/environments/gnome.nix | 6 ++++-- nixos/hardware/fstab.nix | 4 ++-- nixos/services/services.nix | 2 ++ 6 files changed, 15 insertions(+), 7 deletions(-) diff --git a/home-manager/packages/packages.nix b/home-manager/packages/packages.nix index 38a387d..ed6fb5c 100644 --- a/home-manager/packages/packages.nix +++ b/home-manager/packages/packages.nix @@ -19,6 +19,10 @@ tor-browser nix-search-cli mpv - dolphin + element-desktop + mission-center + nvtop ]; + + nixpkgs.config.allowUnfree = true; } diff --git a/home-manager/packages/zsh.nix b/home-manager/packages/zsh.nix index 7fb3a98..cb60ef2 100644 --- a/home-manager/packages/zsh.nix +++ b/home-manager/packages/zsh.nix @@ -44,9 +44,7 @@ zstyle ':completion:*' matcher-list 'm:{a-z}={A-Za-z}' zstyle ':completion:*' menu no zstyle ':fzf-tab:complete:cd:*' fzf-preview 'ls --color $realpath' - zstyle ':fzf-tab:complete:__zoxide_z:*' fzf-preview 'ls --color $realpath' eval "$(fzf --zsh)" - eval "$(zoxide init --cmd cd zsh)" ''; }; diff --git a/nixos/configuration.nix b/nixos/configuration.nix index 918c017..b2ac280 100644 --- a/nixos/configuration.nix +++ b/nixos/configuration.nix @@ -12,6 +12,8 @@ ./misc/misc.nix ]; + nixpkgs.config.allowUnfree = true; + # Copy the NixOS configuration file and link it from the resulting system # (/run/current-system/configuration.nix). This is useful in case you # accidentally delete configuration.nix. diff --git a/nixos/environments/gnome.nix b/nixos/environments/gnome.nix index 09b3483..ce7d35f 100644 --- a/nixos/environments/gnome.nix +++ b/nixos/environments/gnome.nix @@ -1,7 +1,9 @@ { ... }: { - services.xserver.enable = false; + services.xserver.enable = true; + services.xserver.videoDrivers = ["nvidia"]; services.xserver.displayManager.gdm.enable = true; + services.xserver.displayManager.gdm.wayland = true; services.xserver.desktopManager.gnome.enable = true; -} \ No newline at end of file +} diff --git a/nixos/hardware/fstab.nix b/nixos/hardware/fstab.nix index 321df02..b8cbc26 100644 --- a/nixos/hardware/fstab.nix +++ b/nixos/hardware/fstab.nix @@ -2,12 +2,12 @@ { fileSystems."/" = - { device = "/dev/disk/by-uuid/6f9a4486-8f14-468f-aecb-5e0df8af2309"; + { device = "/dev/disk/by-uuid/afce32c1-67df-4324-aebb-a113b71317b9"; fsType = "ext4"; }; fileSystems."/boot" = - { device = "/dev/disk/by-uuid/4A4B-5B94"; + { device = "/dev/disk/by-uuid/12CE-A600"; fsType = "vfat"; options = [ "fmask=0022" "dmask=0022" ]; }; diff --git a/nixos/services/services.nix b/nixos/services/services.nix index 25567fb..406d113 100644 --- a/nixos/services/services.nix +++ b/nixos/services/services.nix @@ -10,4 +10,6 @@ ./libinput.nix ./networkmanager.nix ]; + + services.flatpak.enable = true; } From 0a5e35dad3fb8ce739d5a613f82d9aa95c933a8e Mon Sep 17 00:00:00 2001 From: luxzi Date: Thu, 26 Sep 2024 01:36:59 -0400 Subject: [PATCH 037/102] add: allowed signers file path --- home-manager/packages/git.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/home-manager/packages/git.nix b/home-manager/packages/git.nix index 443166f..33b4d21 100644 --- a/home-manager/packages/git.nix +++ b/home-manager/packages/git.nix @@ -16,6 +16,7 @@ extraConfig = { init.defaultBranch = "main"; gpg.format = "ssh"; + gpg.ssh.allowedSignersFile = "/home/luxzi/.ssh/allowed_signers"; core.symlinks = true; }; }; From 82bee19207b9b4c4b425b949e494be6238eef0df Mon Sep 17 00:00:00 2001 From: luxzi Date: Thu, 26 Sep 2024 16:28:53 -0400 Subject: [PATCH 038/102] add: starship prompt --- home-manager/packages/zsh.nix | 133 +++++++++++----------------------- 1 file changed, 44 insertions(+), 89 deletions(-) diff --git a/home-manager/packages/zsh.nix b/home-manager/packages/zsh.nix index cb60ef2..956dd25 100644 --- a/home-manager/packages/zsh.nix +++ b/home-manager/packages/zsh.nix @@ -48,97 +48,52 @@ ''; }; - programs.oh-my-posh = { + programs.starship = { enable = true; - enableZshIntegration = true; settings = { - "$schema" = "https://raw.githubusercontent.com/JanDeDobbeleer/oh-my-posh/main/themes/schema.json"; - palette = { - os = "#ACB0BE"; - pink = "#F5BDE6"; - lavender = "#B7BDF8"; - blue = "#8AADF4"; - white = "#FFFFFF"; - text = "#494D64"; - }; - blocks = [ - { - alignment = "left"; - newline = true; - segments = [ - { - background = "p:blue"; - foreground = "p:white"; - powerline_symbol = builtins.fromJSON '' "\ue0b4" ''; - leading_diamond = builtins.fromJSON '' "\ue0b6" ''; - style = "diamond"; - template = "{{.Icon}} "; - type = "os"; - } - { - background = "p:blue"; - foreground = "p:text"; - powerline_symbol = builtins.fromJSON '' "\ue0b4" ''; - style = "diamond"; - template = "{{ .UserName }}@{{ .HostName }}"; - type = "session"; - } - { - background = "p:pink"; - foreground = "p:text"; - properties = { - folder_icon = "..\ue5fe.."; - home_icon = "~"; - style = "folder"; - }; - powerline_symbol = builtins.fromJSON '' "\ue0b4" ''; - style = "powerline"; - template = builtins.fromJSON '' " \udb81\udf70 {{ .Path }}" ''; - type = "path"; - } - { - background = "p:blue"; - foreground = "p:text"; - powerline_symbol = builtins.fromJSON '' "\ue0b4" ''; - template = builtins.fromJSON '' "{{if .Env.IN_NIX_SHELL}} \uf313 in nix-shell{{else}}{{end}}" ''; - style = "diamond"; - type = "text"; - } - { - background = "p:lavender"; - foreground = "p:text"; - style = "powerline"; - properties = { - branch_icon = builtins.fromJSON '' "\ue725 " ''; - cherry_pick_icon = builtins.fromJSON '' "\ue29b " ''; - commit_icon = builtins.fromJSON '' "\uf417 " ''; - fetch_status = true; - fetch_upstream_icon = true; - fetch_bare_info = true; - merge_icon = builtins.fromJSON '' "\ue727 " ''; - no_commits_icon = builtins.fromJSON '' "\uf0c3 " ''; - rebase_icon = builtins.fromJSON '' "\ue728 " ''; - revert_icon = builtins.fromJSON '' "\uf0e2 " ''; - tag_icon = builtins.fromJSON '' "\uf412 " ''; - }; - powerline_symbol = builtins.fromJSON '' "\ue0b4" ''; - template = " {{ .HEAD }}{{ .Working }}"; - type = "git"; - } - { - background = "#f38ba8"; - foreground = "p:text"; - powerline_symbol = builtins.fromJSON '' "\ue0b4" ''; - template = builtins.fromJSON '' "{{if eq .Code 0}}{{else}} \uea87 {{.Code}}<#f38ba8,transparent>\ue0b4{{end}}" ''; - type = "status"; - style = "diamond"; - } - ]; - type = "prompt"; - } - ]; - final_space = true; - version = 2; + format = "$username$hostname$directory$git_branch$git_state$git_status$nix_shell$cmd_duration$line_break$python$character"; + + directory = { + style = "blue"; + }; + + character = { + success_symbol = "[❯](white)"; + error_symbol = "[❯](red)"; + vimcmd_symbol = "[❮](green)"; + }; + + git_branch = { + format = "[$branch]($style)"; + style = "green"; + }; + + git_status = { + format = "[[($conflicted$untracked$modified$staged$renamed$deleted)](218) ($ahead_behind$stashed)]($style)"; + style = "cyan"; + conflicted = "!"; + untracked = "​u"; + modified = "​*"; + staged = "​+"; + renamed = "r"; + deleted = "d"; + stashed = "≡"; + }; + + git_state = { + format = "\([$state( $progress_current/$progress_total)]($style)\) "; + style = "bright-black"; + }; + + cmd_duration = { + format = "[$duration]($style) "; + style = "yellow"; + }; + + python = { + format = "[$virtualenv]($style) "; + style = "bright-black"; }; }; + }; } From 99a89f091604eb84c87a16e8aa03ef876707554c Mon Sep 17 00:00:00 2001 From: luxzi Date: Thu, 26 Sep 2024 17:06:24 -0400 Subject: [PATCH 039/102] fix: use gpg signing --- home-manager/packages/git.nix | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/home-manager/packages/git.nix b/home-manager/packages/git.nix index 33b4d21..707417f 100644 --- a/home-manager/packages/git.nix +++ b/home-manager/packages/git.nix @@ -10,14 +10,13 @@ kl = "log --show-signature"; }; signing = { - key = "/home/luxzi/.ssh/luxzi"; + key = "C90237A70F2FDD53"; signByDefault = true; }; extraConfig = { init.defaultBranch = "main"; - gpg.format = "ssh"; - gpg.ssh.allowedSignersFile = "/home/luxzi/.ssh/allowed_signers"; core.symlinks = true; + commit.gpgsign = true; }; }; } From e141f494c7ac222460dbb332e9b368c1469c6d8b Mon Sep 17 00:00:00 2001 From: luxzi Date: Fri, 11 Oct 2024 22:25:08 -0400 Subject: [PATCH 040/102] add: alacritty --- home-manager/packages/packages.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/home-manager/packages/packages.nix b/home-manager/packages/packages.nix index ed6fb5c..51fe1b6 100644 --- a/home-manager/packages/packages.nix +++ b/home-manager/packages/packages.nix @@ -22,6 +22,7 @@ element-desktop mission-center nvtop + alacritty ]; nixpkgs.config.allowUnfree = true; From 590b019667a92d80ba8ee9c64ce47293f0a87f55 Mon Sep 17 00:00:00 2001 From: luxzi Date: Sun, 26 Jan 2025 17:54:55 -0500 Subject: [PATCH 041/102] fix: outdated package names --- flake.lock | 39 ++++++++++++++++++++++-------- home-manager/packages/kitty.nix | 3 +-- home-manager/packages/packages.nix | 1 + nixos/configuration.nix | 4 +-- nixos/programs/programs.nix | 2 +- 5 files changed, 34 insertions(+), 15 deletions(-) diff --git a/flake.lock b/flake.lock index 9d35b51..793d90f 100644 --- a/flake.lock +++ b/flake.lock @@ -1,12 +1,15 @@ { "nodes": { "catppuccin": { + "inputs": { + "nixpkgs": "nixpkgs" + }, "locked": { - "lastModified": 1721784420, - "narHash": "sha256-bgF6fN4Qgk7NErFKGuuqWXcLORsiykTYyqMUFRiAUBY=", + "lastModified": 1737579274, + "narHash": "sha256-8kBIYfn8TI9jbffhDNS12SdbQHb9ITXflwcgIJBeGqw=", "owner": "catppuccin", "repo": "nix", - "rev": "8bdb55cc1c13f572b6e4307a3c0d64f1ae286a4f", + "rev": "06f0ea19334bcc8112e6d671fd53e61f9e3ad63a", "type": "github" }, "original": { @@ -22,11 +25,11 @@ ] }, "locked": { - "lastModified": 1721804110, - "narHash": "sha256-i4jINRazBKPqlaS+qhlP+kV/UHEq3vs5itfpblqu4ZM=", + "lastModified": 1737762889, + "narHash": "sha256-5HGG09bh/Yx0JA8wtBMAzt0HMCL1bYZ93x4IqzVExio=", "owner": "nix-community", "repo": "home-manager", - "rev": "af70fc502a15d7e1e4c5a4c4fc8e06c2ec561e0c", + "rev": "daf04c5950b676f47a794300657f1d3d14c1a120", "type": "github" }, "original": { @@ -37,11 +40,27 @@ }, "nixpkgs": { "locked": { - "lastModified": 1721562059, - "narHash": "sha256-Tybxt65eyOARf285hMHIJ2uul8SULjFZbT9ZaEeUnP8=", + "lastModified": 1736012469, + "narHash": "sha256-/qlNWm/IEVVH7GfgAIyP6EsVZI6zjAx1cV5zNyrs+rI=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "68c9ed8bbed9dfce253cc91560bf9043297ef2fe", + "rev": "8f3e1f807051e32d8c95cd12b9b421623850a34d", + "type": "github" + }, + "original": { + "owner": "NixOS", + "ref": "nixos-unstable", + "repo": "nixpkgs", + "type": "github" + } + }, + "nixpkgs_2": { + "locked": { + "lastModified": 1737885589, + "narHash": "sha256-Zf0hSrtzaM1DEz8//+Xs51k/wdSajticVrATqDrfQjg=", + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "852ff1d9e153d8875a83602e03fdef8a63f0ecf8", "type": "github" }, "original": { @@ -55,7 +74,7 @@ "inputs": { "catppuccin": "catppuccin", "home-manager": "home-manager", - "nixpkgs": "nixpkgs" + "nixpkgs": "nixpkgs_2" } } }, diff --git a/home-manager/packages/kitty.nix b/home-manager/packages/kitty.nix index ac34fa4..b071f86 100644 --- a/home-manager/packages/kitty.nix +++ b/home-manager/packages/kitty.nix @@ -3,10 +3,9 @@ { programs.kitty = { enable = true; - theme = "Catppuccin-Mocha"; font = { name = "FiraCode Nerd Font"; - package = pkgs.fira-code-nerdfont; + package = pkgs.nerd-fonts.fira-code; size = 14; }; settings = { diff --git a/home-manager/packages/packages.nix b/home-manager/packages/packages.nix index 51fe1b6..eefd3b9 100644 --- a/home-manager/packages/packages.nix +++ b/home-manager/packages/packages.nix @@ -23,6 +23,7 @@ mission-center nvtop alacritty + nerd-fonts.fira-code ]; nixpkgs.config.allowUnfree = true; diff --git a/nixos/configuration.nix b/nixos/configuration.nix index b2ac280..0984d3f 100644 --- a/nixos/configuration.nix +++ b/nixos/configuration.nix @@ -4,8 +4,8 @@ imports = [ # Include the results of the hardware scan. ./hardware/hardware.nix - # ./environments/plasma-wayland.nix - ./environments/gnome.nix + ./environments/plasma-wayland.nix + # ./environments/gnome.nix ./users/luxzi.nix ./services/services.nix ./programs/programs.nix diff --git a/nixos/programs/programs.nix b/nixos/programs/programs.nix index 68581da..6b2b27c 100644 --- a/nixos/programs/programs.nix +++ b/nixos/programs/programs.nix @@ -14,7 +14,7 @@ curl git neovim - fira-code-nerdfont + nerd-fonts.fira-code cmake ninja libgcc From ad124505da44eeea8de874a568205d752696227a Mon Sep 17 00:00:00 2001 From: luxzi Date: Sun, 26 Jan 2025 18:11:55 -0500 Subject: [PATCH 042/102] fix: correctly catagorize pulseaudio --- nixos/hardware/audio.nix | 5 ----- nixos/services/audio.nix | 5 +++++ 2 files changed, 5 insertions(+), 5 deletions(-) delete mode 100644 nixos/hardware/audio.nix create mode 100644 nixos/services/audio.nix diff --git a/nixos/hardware/audio.nix b/nixos/hardware/audio.nix deleted file mode 100644 index 82ca1fa..0000000 --- a/nixos/hardware/audio.nix +++ /dev/null @@ -1,5 +0,0 @@ -{ ... }: - -{ - hardware.pulseaudio.enable = false; -} diff --git a/nixos/services/audio.nix b/nixos/services/audio.nix new file mode 100644 index 0000000..268a81c --- /dev/null +++ b/nixos/services/audio.nix @@ -0,0 +1,5 @@ +{ ... }: + +{ + services.pulseaudio.enable = false; +} From c556ce55b6df67982555fa49b4d7c6e1c7b52bad Mon Sep 17 00:00:00 2001 From: Chance Date: Sat, 29 Mar 2025 21:03:07 -0400 Subject: [PATCH 043/102] add core configuration --- .gitignore | 1 + LICENSE | 19 -- README.md | 40 --- bootstrap.sh | 5 - flake.lock | 320 ++++++++++++++++-- flake.nix | 135 ++++++-- home-manager/home.nix | 14 - home-manager/modules/chromium/default.nix | 27 ++ home-manager/modules/ghostty/default.nix | 37 ++ home-manager/modules/ghostty/shaders/crt.glsl | 153 +++++++++ .../modules/ghostty/shaders/glow.glsl | 145 ++++++++ home-manager/modules/git/default.nix | 33 ++ home-manager/modules/hyprland/default.nix | 116 +++++++ home-manager/modules/neovim/colorscheme.nix | 42 +++ home-manager/modules/neovim/default.nix | 32 ++ home-manager/modules/neovim/keybinds.nix | 32 ++ .../modules/neovim/plugins/default.nix | 24 ++ .../modules/neovim/plugins/gitsigns.nix | 45 +++ .../modules/neovim/plugins/lsp/cmp.nix | 85 +++++ .../modules/neovim/plugins/lsp/default.nix | 192 +++++++++++ .../modules/neovim/plugins/lualine.nix | 21 ++ .../modules/neovim/plugins/telescope.nix | 47 +++ home-manager/modules/neovim/plugins/tree.nix | 17 + .../modules/neovim/plugins/treesitter.nix | 19 ++ home-manager/modules/rofi/default.nix | 20 ++ home-manager/modules/vscode/default.nix | 84 +++++ home-manager/modules/waybar/default.nix | 18 + home-manager/modules/zed/default.nix | 103 ++++++ home-manager/modules/zsh/default.nix | 53 +++ home-manager/nix/home.nix | 85 +++++ .../packages/doom-emacs/.doom.d/config.el | 100 ------ .../packages/doom-emacs/.doom.d/custom.el | 13 - .../packages/doom-emacs/.doom.d/init.el | 191 ----------- .../packages/doom-emacs/.doom.d/packages.el | 63 ---- home-manager/packages/doom-emacs/.gitignore | 1 - home-manager/packages/emacs.nix | 23 -- home-manager/packages/git.nix | 22 -- home-manager/packages/kitty.nix | 17 - home-manager/packages/packages.nix | 30 -- home-manager/packages/zsh.nix | 99 ------ home-manager/profiles/desktop.nix | 22 ++ home-manager/profiles/main.nix | 10 + machines/nix/configuration.nix | 79 +++++ machines/nix/hardware-configuration.nix | 45 +++ machines/nix/plymouth.nix | 31 ++ modules/common/common.nix | 47 +++ modules/common/default.nix | 17 + modules/common/desktop.nix | 82 +++++ modules/common/locale.nix | 18 + modules/common/nixcommon.nix | 49 +++ modules/containers/default.nix | 48 +++ modules/fileshare/default.nix | 17 + modules/fileshare/samba.nix | 55 +++ modules/hardware/default.nix | 17 + modules/hardware/laptop.nix | 33 ++ modules/hardware/nvidia.nix | 67 ++++ modules/hyprland/default.nix | 141 ++++++++ modules/plasma/default.nix | 18 + modules/runners/default.nix | 32 ++ modules/runners/secrets/lily.age | 7 + modules/runners/secrets/potato.age | Bin 0 -> 369 bytes modules/runners/secrets/secrets.nix | 19 ++ modules/users/default.nix | 17 + modules/users/lily.nix | 21 ++ modules/wayland/default.nix | 37 ++ nixos/configuration.nix | 28 -- nixos/environments/gnome.nix | 9 - nixos/environments/plasma-wayland.nix | 14 - nixos/hardware/fstab.nix | 14 - nixos/hardware/hardware.nix | 13 - nixos/hardware/intel.nix | 6 - nixos/hardware/modules.nix | 13 - nixos/hardware/network.nix | 5 - nixos/hardware/nvidia.nix | 13 - nixos/misc/locale.nix | 5 - nixos/misc/misc.nix | 10 - nixos/misc/nixconfig.nix | 6 - nixos/misc/time.nix | 5 - nixos/programs/dconf.nix | 5 - nixos/programs/gpg.nix | 8 - nixos/programs/nix-ld.nix | 8 - nixos/programs/programs.nix | 36 -- nixos/programs/steam.nix | 5 - nixos/services/audio.nix | 5 - nixos/services/boot.nix | 9 - nixos/services/cups.nix | 5 - nixos/services/firewall.nix | 7 - nixos/services/libinput.nix | 5 - nixos/services/networkmanager.nix | 6 - nixos/services/pipewire.nix | 11 - nixos/services/services.nix | 15 - nixos/users/luxzi.nix | 15 - overlays/default.nix | 37 ++ pkgs/default.nix | 5 + 94 files changed, 2816 insertions(+), 959 deletions(-) create mode 100644 .gitignore delete mode 100644 LICENSE delete mode 100644 README.md delete mode 100644 bootstrap.sh delete mode 100644 home-manager/home.nix create mode 100644 home-manager/modules/chromium/default.nix create mode 100644 home-manager/modules/ghostty/default.nix create mode 100644 home-manager/modules/ghostty/shaders/crt.glsl create mode 100644 home-manager/modules/ghostty/shaders/glow.glsl create mode 100644 home-manager/modules/git/default.nix create mode 100644 home-manager/modules/hyprland/default.nix create mode 100644 home-manager/modules/neovim/colorscheme.nix create mode 100644 home-manager/modules/neovim/default.nix create mode 100644 home-manager/modules/neovim/keybinds.nix create mode 100644 home-manager/modules/neovim/plugins/default.nix create mode 100644 home-manager/modules/neovim/plugins/gitsigns.nix create mode 100644 home-manager/modules/neovim/plugins/lsp/cmp.nix create mode 100644 home-manager/modules/neovim/plugins/lsp/default.nix create mode 100644 home-manager/modules/neovim/plugins/lualine.nix create mode 100644 home-manager/modules/neovim/plugins/telescope.nix create mode 100644 home-manager/modules/neovim/plugins/tree.nix create mode 100644 home-manager/modules/neovim/plugins/treesitter.nix create mode 100644 home-manager/modules/rofi/default.nix create mode 100644 home-manager/modules/vscode/default.nix create mode 100644 home-manager/modules/waybar/default.nix create mode 100644 home-manager/modules/zed/default.nix create mode 100644 home-manager/modules/zsh/default.nix create mode 100644 home-manager/nix/home.nix delete mode 100644 home-manager/packages/doom-emacs/.doom.d/config.el delete mode 100644 home-manager/packages/doom-emacs/.doom.d/custom.el delete mode 100644 home-manager/packages/doom-emacs/.doom.d/init.el delete mode 100644 home-manager/packages/doom-emacs/.doom.d/packages.el delete mode 100644 home-manager/packages/doom-emacs/.gitignore delete mode 100644 home-manager/packages/emacs.nix delete mode 100644 home-manager/packages/git.nix delete mode 100644 home-manager/packages/kitty.nix delete mode 100644 home-manager/packages/packages.nix delete mode 100644 home-manager/packages/zsh.nix create mode 100644 home-manager/profiles/desktop.nix create mode 100644 home-manager/profiles/main.nix create mode 100644 machines/nix/configuration.nix create mode 100644 machines/nix/hardware-configuration.nix create mode 100644 machines/nix/plymouth.nix create mode 100644 modules/common/common.nix create mode 100644 modules/common/default.nix create mode 100644 modules/common/desktop.nix create mode 100644 modules/common/locale.nix create mode 100644 modules/common/nixcommon.nix create mode 100644 modules/containers/default.nix create mode 100644 modules/fileshare/default.nix create mode 100644 modules/fileshare/samba.nix create mode 100644 modules/hardware/default.nix create mode 100644 modules/hardware/laptop.nix create mode 100644 modules/hardware/nvidia.nix create mode 100644 modules/hyprland/default.nix create mode 100644 modules/plasma/default.nix create mode 100644 modules/runners/default.nix create mode 100644 modules/runners/secrets/lily.age create mode 100644 modules/runners/secrets/potato.age create mode 100644 modules/runners/secrets/secrets.nix create mode 100644 modules/users/default.nix create mode 100644 modules/users/lily.nix create mode 100644 modules/wayland/default.nix delete mode 100644 nixos/configuration.nix delete mode 100644 nixos/environments/gnome.nix delete mode 100644 nixos/environments/plasma-wayland.nix delete mode 100644 nixos/hardware/fstab.nix delete mode 100644 nixos/hardware/hardware.nix delete mode 100644 nixos/hardware/intel.nix delete mode 100644 nixos/hardware/modules.nix delete mode 100644 nixos/hardware/network.nix delete mode 100644 nixos/hardware/nvidia.nix delete mode 100644 nixos/misc/locale.nix delete mode 100644 nixos/misc/misc.nix delete mode 100644 nixos/misc/nixconfig.nix delete mode 100644 nixos/misc/time.nix delete mode 100644 nixos/programs/dconf.nix delete mode 100644 nixos/programs/gpg.nix delete mode 100644 nixos/programs/nix-ld.nix delete mode 100644 nixos/programs/programs.nix delete mode 100644 nixos/programs/steam.nix delete mode 100644 nixos/services/audio.nix delete mode 100644 nixos/services/boot.nix delete mode 100644 nixos/services/cups.nix delete mode 100644 nixos/services/firewall.nix delete mode 100644 nixos/services/libinput.nix delete mode 100644 nixos/services/networkmanager.nix delete mode 100644 nixos/services/pipewire.nix delete mode 100644 nixos/services/services.nix delete mode 100644 nixos/users/luxzi.nix create mode 100644 overlays/default.nix create mode 100644 pkgs/default.nix diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..03bd412 --- /dev/null +++ b/.gitignore @@ -0,0 +1 @@ +*.env diff --git a/LICENSE b/LICENSE deleted file mode 100644 index 93972a0..0000000 --- a/LICENSE +++ /dev/null @@ -1,19 +0,0 @@ -Copyright (c) 2024 Luxzi - -Permission is hereby granted, free of charge, to any person obtaining a copy -of this software and associated documentation files (the "Software"), to deal -in the Software without restriction, including without limitation the rights -to use, copy, modify, merge, publish, distribute, sublicense, and/or sell -copies of the Software, and to permit persons to whom the Software is -furnished to do so, subject to the following conditions: - -The above copyright notice and this permission notice shall be included in all -copies or substantial portions of the Software. - -THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR -IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, -FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE -AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER -LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, -OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE -SOFTWARE. diff --git a/README.md b/README.md deleted file mode 100644 index 2e54a8a..0000000 --- a/README.md +++ /dev/null @@ -1,40 +0,0 @@ -# NixOS configuration files - -Configured for KDE Plasma Wayland on Nvidia. - -## Customizing user settings - -To change your username or any additional user settings, you must: - -- Create `./nixos/users/.nix`, this can be copied from `luxzi.nix` in the same directory. -- Import the newly created file in `./nixos/configuration.nix`. -- Edit `./home-manager/home.nix` to the corresponding username and home directory. - -## Adjusting hardware configuration - -> [!NOTE] -> If you use an older Nvidia graphics card (i.e. before RTX 20 series), you do not need to modify `./nixos/hardware/nvidia.nix`. -> Although if you use a newer Nvidia graphics card, it is advised to enable `open` to use the open-source kernel driver. - -To use AMD graphics cards: - -- Create `./nixos/hardware/amd.nix` -- Add `services.xserver.videoDrivers = [ "amdgpu" ];` - -## Deployment - -If you would like to use these configuration files as is: - -- Mount and format desired filesystems (as described in the NixOS manual). -- Run the following git clone command while also making sure to replace `` with your desired username: -``` sh -git clone git@codeberg.org:luxzi/nixos /mnt/home//.dotfiles -``` -- Make any desired changes. -- Install the system with the command below, again, making sure to replace `` with your desired username: -``` sh -nixos-install --flake /mnt/home//.dotfiles -``` - -For more modified versions of this configuration, I recommend forking this repository. - diff --git a/bootstrap.sh b/bootstrap.sh deleted file mode 100644 index 09296e2..0000000 --- a/bootstrap.sh +++ /dev/null @@ -1,5 +0,0 @@ -#!/bin/sh - -nix-channel --add https://nixos.org/channels/nixos-unstable nixos -nixos-rebuild switch --upgrade -nixos-install --flake /mnt/home/luxzi/.dotfiles diff --git a/flake.lock b/flake.lock index 793d90f..f732535 100644 --- a/flake.lock +++ b/flake.lock @@ -1,35 +1,118 @@ { "nodes": { - "catppuccin": { + "agenix": { "inputs": { - "nixpkgs": "nixpkgs" + "darwin": "darwin", + "home-manager": "home-manager", + "nixpkgs": "nixpkgs", + "systems": "systems" }, "locked": { - "lastModified": 1737579274, - "narHash": "sha256-8kBIYfn8TI9jbffhDNS12SdbQHb9ITXflwcgIJBeGqw=", - "owner": "catppuccin", - "repo": "nix", - "rev": "06f0ea19334bcc8112e6d671fd53e61f9e3ad63a", + "lastModified": 1736955230, + "narHash": "sha256-uenf8fv2eG5bKM8C/UvFaiJMZ4IpUFaQxk9OH5t/1gA=", + "owner": "ryantm", + "repo": "agenix", + "rev": "e600439ec4c273cf11e06fe4d9d906fb98fa097c", "type": "github" }, "original": { - "owner": "catppuccin", - "repo": "nix", + "owner": "ryantm", + "repo": "agenix", + "type": "github" + } + }, + "darwin": { + "inputs": { + "nixpkgs": [ + "agenix", + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1700795494, + "narHash": "sha256-gzGLZSiOhf155FW7262kdHo2YDeugp3VuIFb4/GGng0=", + "owner": "lnl7", + "repo": "nix-darwin", + "rev": "4b9b83d5a92e8c1fbfd8eb27eda375908c11ec4d", + "type": "github" + }, + "original": { + "owner": "lnl7", + "ref": "master", + "repo": "nix-darwin", + "type": "github" + } + }, + "flake-parts": { + "inputs": { + "nixpkgs-lib": "nixpkgs-lib" + }, + "locked": { + "lastModified": 1741352980, + "narHash": "sha256-+u2UunDA4Cl5Fci3m7S643HzKmIDAe+fiXrLqYsR2fs=", + "owner": "hercules-ci", + "repo": "flake-parts", + "rev": "f4330d22f1c5d2ba72d3d22df5597d123fdb60a9", + "type": "github" + }, + "original": { + "owner": "hercules-ci", + "repo": "flake-parts", + "type": "github" + } + }, + "flake-parts_2": { + "inputs": { + "nixpkgs-lib": [ + "nixvim", + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1741352980, + "narHash": "sha256-+u2UunDA4Cl5Fci3m7S643HzKmIDAe+fiXrLqYsR2fs=", + "owner": "hercules-ci", + "repo": "flake-parts", + "rev": "f4330d22f1c5d2ba72d3d22df5597d123fdb60a9", + "type": "github" + }, + "original": { + "owner": "hercules-ci", + "repo": "flake-parts", + "type": "github" + } + }, + "flake-utils": { + "inputs": { + "systems": "systems_2" + }, + "locked": { + "lastModified": 1731533236, + "narHash": "sha256-l0KFg5HjrsfsO/JpG+r7fRrqm12kzFHyUHqHCVpMMbI=", + "owner": "numtide", + "repo": "flake-utils", + "rev": "11707dc2f618dd54ca8739b309ec4fc024de578b", + "type": "github" + }, + "original": { + "owner": "numtide", + "repo": "flake-utils", "type": "github" } }, "home-manager": { "inputs": { "nixpkgs": [ + "agenix", "nixpkgs" ] }, "locked": { - "lastModified": 1737762889, - "narHash": "sha256-5HGG09bh/Yx0JA8wtBMAzt0HMCL1bYZ93x4IqzVExio=", + "lastModified": 1703113217, + "narHash": "sha256-7ulcXOk63TIT2lVDSExj7XzFx09LpdSAPtvgtM7yQPE=", "owner": "nix-community", "repo": "home-manager", - "rev": "daf04c5950b676f47a794300657f1d3d14c1a120", + "rev": "3bfaacf46133c037bb356193bd2f1765d9dc82c1", "type": "github" }, "original": { @@ -38,13 +121,81 @@ "type": "github" } }, + "home-manager_2": { + "inputs": { + "nixpkgs": [ + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1742234739, + "narHash": "sha256-zFL6zsf/5OztR1NSNQF33dvS1fL/BzVUjabZq4qrtY4=", + "owner": "nix-community", + "repo": "home-manager", + "rev": "f6af7280a3390e65c2ad8fd059cdc303426cbd59", + "type": "github" + }, + "original": { + "owner": "nix-community", + "ref": "release-24.11", + "repo": "home-manager", + "type": "github" + } + }, + "ixx": { + "inputs": { + "flake-utils": [ + "nixvim", + "nuschtosSearch", + "flake-utils" + ], + "nixpkgs": [ + "nixvim", + "nuschtosSearch", + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1729958008, + "narHash": "sha256-EiOq8jF4Z/zQe0QYVc3+qSKxRK//CFHMB84aYrYGwEs=", + "owner": "NuschtOS", + "repo": "ixx", + "rev": "9fd01aad037f345350eab2cd45e1946cc66da4eb", + "type": "github" + }, + "original": { + "owner": "NuschtOS", + "ref": "v0.0.6", + "repo": "ixx", + "type": "github" + } + }, + "nix-gaming": { + "inputs": { + "flake-parts": "flake-parts", + "nixpkgs": "nixpkgs_2" + }, + "locked": { + "lastModified": 1742262357, + "narHash": "sha256-6JGR5I4cuFFun3AJKPnMPz6PKUPywIH+AFYROUFRvYQ=", + "owner": "fufexan", + "repo": "nix-gaming", + "rev": "53eda8bba79a2c28782734bca51d70ecffb82d74", + "type": "github" + }, + "original": { + "owner": "fufexan", + "repo": "nix-gaming", + "type": "github" + } + }, "nixpkgs": { "locked": { - "lastModified": 1736012469, - "narHash": "sha256-/qlNWm/IEVVH7GfgAIyP6EsVZI6zjAx1cV5zNyrs+rI=", + "lastModified": 1703013332, + "narHash": "sha256-+tFNwMvlXLbJZXiMHqYq77z/RfmpfpiI3yjL6o/Zo9M=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "8f3e1f807051e32d8c95cd12b9b421623850a34d", + "rev": "54aac082a4d9bb5bbc5c4e899603abfb76a3f6d6", "type": "github" }, "original": { @@ -54,27 +205,152 @@ "type": "github" } }, + "nixpkgs-lib": { + "locked": { + "lastModified": 1740877520, + "narHash": "sha256-oiwv/ZK/2FhGxrCkQkB83i7GnWXPPLzoqFHpDD3uYpk=", + "owner": "nix-community", + "repo": "nixpkgs.lib", + "rev": "147dee35aab2193b174e4c0868bd80ead5ce755c", + "type": "github" + }, + "original": { + "owner": "nix-community", + "repo": "nixpkgs.lib", + "type": "github" + } + }, + "nixpkgs-unstable": { + "locked": { + "lastModified": 1742288794, + "narHash": "sha256-Txwa5uO+qpQXrNG4eumPSD+hHzzYi/CdaM80M9XRLCo=", + "owner": "nixos", + "repo": "nixpkgs", + "rev": "b6eaf97c6960d97350c584de1b6dcff03c9daf42", + "type": "github" + }, + "original": { + "owner": "nixos", + "ref": "nixos-unstable", + "repo": "nixpkgs", + "type": "github" + } + }, "nixpkgs_2": { "locked": { - "lastModified": 1737885589, - "narHash": "sha256-Zf0hSrtzaM1DEz8//+Xs51k/wdSajticVrATqDrfQjg=", + "lastModified": 1741865919, + "narHash": "sha256-4thdbnP6dlbdq+qZWTsm4ffAwoS8Tiq1YResB+RP6WE=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "852ff1d9e153d8875a83602e03fdef8a63f0ecf8", + "rev": "573c650e8a14b2faa0041645ab18aed7e60f0c9a", "type": "github" }, "original": { "owner": "NixOS", - "ref": "nixos-unstable", + "ref": "nixpkgs-unstable", "repo": "nixpkgs", "type": "github" } }, + "nixpkgs_3": { + "locked": { + "lastModified": 1742268799, + "narHash": "sha256-IhnK4LhkBlf14/F8THvUy3xi/TxSQkp9hikfDZRD4Ic=", + "owner": "nixos", + "repo": "nixpkgs", + "rev": "da044451c6a70518db5b730fe277b70f494188f1", + "type": "github" + }, + "original": { + "owner": "nixos", + "ref": "nixos-24.11", + "repo": "nixpkgs", + "type": "github" + } + }, + "nixvim": { + "inputs": { + "flake-parts": "flake-parts_2", + "nixpkgs": [ + "nixpkgs" + ], + "nuschtosSearch": "nuschtosSearch" + }, + "locked": { + "lastModified": 1742396414, + "narHash": "sha256-e9Uv44rVDAG2ohNejttl9Pq5r4dxIzWxt+1hvKTQK5E=", + "owner": "nix-community", + "repo": "nixvim", + "rev": "d79c291d5d80d587d518e0f530cc55adb0638c80", + "type": "github" + }, + "original": { + "owner": "nix-community", + "repo": "nixvim", + "type": "github" + } + }, + "nuschtosSearch": { + "inputs": { + "flake-utils": "flake-utils", + "ixx": "ixx", + "nixpkgs": [ + "nixvim", + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1741886583, + "narHash": "sha256-sScfYKtxp3CYv5fJcHQDvQjqBL+tPNQqS9yf9Putd+s=", + "owner": "NuschtOS", + "repo": "search", + "rev": "2974bc5fa3441a319fba943f3ca41f7dcd1a1467", + "type": "github" + }, + "original": { + "owner": "NuschtOS", + "repo": "search", + "type": "github" + } + }, "root": { "inputs": { - "catppuccin": "catppuccin", - "home-manager": "home-manager", - "nixpkgs": "nixpkgs_2" + "agenix": "agenix", + "home-manager": "home-manager_2", + "nix-gaming": "nix-gaming", + "nixpkgs": "nixpkgs_3", + "nixpkgs-unstable": "nixpkgs-unstable", + "nixvim": "nixvim" + } + }, + "systems": { + "locked": { + "lastModified": 1681028828, + "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=", + "owner": "nix-systems", + "repo": "default", + "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e", + "type": "github" + }, + "original": { + "owner": "nix-systems", + "repo": "default", + "type": "github" + } + }, + "systems_2": { + "locked": { + "lastModified": 1681028828, + "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=", + "owner": "nix-systems", + "repo": "default", + "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e", + "type": "github" + }, + "original": { + "owner": "nix-systems", + "repo": "default", + "type": "github" } } }, diff --git a/flake.nix b/flake.nix index 168f604..ed0a138 100644 --- a/flake.nix +++ b/flake.nix @@ -1,30 +1,127 @@ { - description = "Luxzi's NixOS system configuration"; + description = "Your new nix config"; inputs = { - nixpkgs.url = "github:NixOS/nixpkgs/nixos-unstable"; - home-manager.url = "github:nix-community/home-manager"; + # Nixpkgs + nixpkgs.url = "github:nixos/nixpkgs/nixos-24.11"; + # You can access packages and modules from different nixpkgs revs + # at the same time. Here's an working example: + nixpkgs-unstable.url = "github:nixos/nixpkgs/nixos-unstable"; + # Also see the 'unstable-packages' overlay at 'overlays/default.nix'. + # Home manager home-manager.inputs.nixpkgs.follows = "nixpkgs"; - - catppuccin.url = "github:catppuccin/nix"; + home-manager.url = "github:nix-community/home-manager/release-24.11"; + agenix.url = "github:ryantm/agenix"; + nixvim.url = "github:nix-community/nixvim"; + nixvim.inputs.nixpkgs.follows = "nixpkgs"; + nix-gaming.url = "github:fufexan/nix-gaming"; }; - outputs = { self, nixpkgs, home-manager, catppuccin, ... }: - let - lib = nixpkgs.lib; - pkgs = nixpkgs.legacyPackages."x86_64-linux"; - in { - nixosConfigurations = { - nixos = lib.nixosSystem { - specialArgs = { inherit self; }; - modules = [ ./nixos/configuration.nix catppuccin.nixosModules.catppuccin ]; + outputs = { + self, + nixpkgs, + home-manager, + agenix, + nixvim, + ... + } @ inputs: let + inherit (self) outputs; + # Supported systems for your flake packages, shell, etc. + systems = [ + "aarch64-linux" + "i686-linux" + "x86_64-linux" + "aarch64-darwin" + "x86_64-darwin" + ]; + # This is a function that generates an attribute by calling a function you + # pass to it, with each system as an argument + forAllSystems = nixpkgs.lib.genAttrs systems; + in { + # Your custom packages + # Accessible through 'nix build', 'nix shell', etc + packages = forAllSystems (system: import ./pkgs nixpkgs.legacyPackages.${system}); + # Formatter for your nix files, available through 'nix fmt' + # Other options beside 'alejandra' include 'nixpkgs-fmt' + formatter = forAllSystems (system: nixpkgs.legacyPackages.${system}.alejandra); + + # Your custom packages and modifications, exported as overlays + overlays = import ./overlays {inherit inputs;}; + + nixosModules = builtins.listToAttrs ( + (map (x: { + name = x; + value = import (./modules + "/${x}"); + }) (builtins.attrNames (builtins.readDir ./modules))) + ++ [ + { + name = "agenix"; + value = agenix.nixosModules.default; + } + ] + ); + + homeManagerModules = + builtins.listToAttrs + ( + map + (name: { + inherit name; + value = import (./home-manager/modules + "/${name}"); + }) + (builtins.attrNames (builtins.readDir ./home-manager/modules)) + ) + // { + nix = {pkgs, ...}: { + imports = [ + inputs.nixvim.homeManagerModules.nixvim + # inputs.plasma-manager.homeManagerModules.plasma-manager + # inputs.wall-utils.homeManagerModules.wall-utils + ]; }; }; - homeConfigurations = { - luxzi = home-manager.lib.homeManagerConfiguration { - inherit pkgs; - modules = [ ./home-manager/home.nix catppuccin.homeManagerModules.catppuccin ]; - }; + # NixOS configuration entrypoint + # Available through 'nixos-rebuild --flake .#your-hostname' + # GreenMachine = nixpkgs.lib.nixosSystem { + # specialArgs = {inherit inputs outputs;}; + # modules = [ + # # > Our main nixos configuration file < + # ./nixos/GreenMachine/configuration.nix + # agenix.nixosModules.default + # ]; + # }; + # }; + nixosConfigurations = + builtins.listToAttrs + ( + map + (x: { + name = x; + value = nixpkgs.lib.nixosSystem { + specialArgs = { + inherit inputs; + flake-self = self; + }; + modules = + builtins.attrValues self.nixosModules + ++ [ + inputs.home-manager.nixosModules.home-manager + inputs.nix-gaming.nixosModules.platformOptimizations + inputs.nixvim.nixosModules.nixvim + (import "${./.}/machines/${x}/configuration.nix" {inherit self;}) + ]; + }; + }) + (builtins.attrNames (builtins.readDir ./machines)) + ); + homeConfigurations = { + lily = {...}: { + imports = + [ + ./home-manager/profiles/desktop.nix + ] + ++ builtins.attrValues self.homeManagerModules; }; }; + }; } diff --git a/home-manager/home.nix b/home-manager/home.nix deleted file mode 100644 index 1499e1c..0000000 --- a/home-manager/home.nix +++ /dev/null @@ -1,14 +0,0 @@ -{ config, pkgs, ... }: - -{ - imports = - [ - ./packages/packages.nix - ]; - - programs.home-manager.enable = true; - - home.username = "luxzi"; - home.homeDirectory = "/home/luxzi"; - home.stateVersion = "24.05"; -} diff --git a/home-manager/modules/chromium/default.nix b/home-manager/modules/chromium/default.nix new file mode 100644 index 0000000..4bc2a70 --- /dev/null +++ b/home-manager/modules/chromium/default.nix @@ -0,0 +1,27 @@ +{ + config, + lib, + ... +}: let + cfg = config.lily.chromium; +in { + options.lily.chromium = { + enable = lib.mkEnableOption "activate chromium"; + }; + config = lib.mkIf cfg.enable { + programs.chromium = { + enable = true; + extensions = [ + {id = "cjpalhdlnbpafiamejdnhcphjbkeiagm";} # ublock origin + {id = "pkehgijcmpdhfbdbbnkijodmdjhbjlgp";} # privacy badger + {id = "ldpochfccmkkmhdbclfhpagapcfdljkj";} # decentraleyes + {id = "mnjggcdmjocbbbhaepdhchncahnbgone";} # sponsor block + {id = "gebbhagfogifgggkldgodflihgfeippi";} # return youtube dislike (just cuz) + ]; + commandLineArgs = [ + "--enable-features=UseOzonePlatform" + "--ozone-platform=wayland" + ]; + }; + }; +} diff --git a/home-manager/modules/ghostty/default.nix b/home-manager/modules/ghostty/default.nix new file mode 100644 index 0000000..5226865 --- /dev/null +++ b/home-manager/modules/ghostty/default.nix @@ -0,0 +1,37 @@ +{ + config, + lib, + ... +}: let + cfg = config.lily.ghostty; +in { + options.lily.ghostty = { + enable = lib.mkEnableOption "activate ghostty"; + }; + + config = lib.mkIf cfg.enable { + home.file.".config/ghostty/shaders" = { + source = ./shaders; + recursive = true; + }; + programs.ghostty = { + enable = true; + + settings = { + background-blur-radius = 0; + #theme = "dark:catppuccin-mocha,light:catppuccin-latte"; + window-theme = "dark"; + background-opacity = 0.75; + minimum-contrast = 1.1; + window-padding-x = 5; + window-padding-y = 5; + gtk-adwaita = false; + gtk-titlebar = false; + # custom-shader = "shaders/crt.glsl"; + # custom-shader = "shaders/glow.glsl"; + confirm-close-surface = false; + custom-shader-animation = true; + }; + }; + }; +} diff --git a/home-manager/modules/ghostty/shaders/crt.glsl b/home-manager/modules/ghostty/shaders/crt.glsl new file mode 100644 index 0000000..ecce90d --- /dev/null +++ b/home-manager/modules/ghostty/shaders/crt.glsl @@ -0,0 +1,153 @@ +// First it does a "chromatic aberration" by splitting the rgb signals by a product of sin functions +// over time, then it does a glow effect in a perceptual color space +// Based on kalgynirae's Ghostty passable glow shader and NickWest's Chromatic Aberration shader demo +// Passable glow: https://github.com/kalgynirae/dotfiles/blob/main/ghostty/glow.glsl +// "Chromatic Aberration": https://www.shadertoy.com/view/Mds3zn + +// sRGB linear -> nonlinear transform from https://bottosson.github.io/posts/colorwrong/ +float f(float x) { + if (x >= 0.0031308) { + return 1.055 * pow(x, 1.0 / 2.4) - 0.055; + } else { + return 12.92 * x; + } +} + +float f_inv(float x) { + if (x >= 0.04045) { + return pow((x + 0.055) / 1.055, 2.4); + } else { + return x / 12.92; + } +} + +// Oklab <-> linear sRGB conversions from https://bottosson.github.io/posts/oklab/ +vec4 toOklab(vec4 rgb) { + vec3 c = vec3(f_inv(rgb.r), f_inv(rgb.g), f_inv(rgb.b)); + float l = 0.4122214708 * c.r + 0.5363325363 * c.g + 0.0514459929 * c.b; + float m = 0.2119034982 * c.r + 0.6806995451 * c.g + 0.1073969566 * c.b; + float s = 0.0883024619 * c.r + 0.2817188376 * c.g + 0.6299787005 * c.b; + float l_ = pow(l, 1.0 / 3.0); + float m_ = pow(m, 1.0 / 3.0); + float s_ = pow(s, 1.0 / 3.0); + return vec4( + 0.2104542553 * l_ + 0.7936177850 * m_ - 0.0040720468 * s_, + 1.9779984951 * l_ - 2.4285922050 * m_ + 0.4505937099 * s_, + 0.0259040371 * l_ + 0.7827717662 * m_ - 0.8086757660 * s_, + rgb.a + ); +} + +vec4 toRgb(vec4 oklab) { + vec3 c = oklab.rgb; + float l_ = c.r + 0.3963377774 * c.g + 0.2158037573 * c.b; + float m_ = c.r - 0.1055613458 * c.g - 0.0638541728 * c.b; + float s_ = c.r - 0.0894841775 * c.g - 1.2914855480 * c.b; + float l = l_ * l_ * l_; + float m = m_ * m_ * m_; + float s = s_ * s_ * s_; + vec3 linear_srgb = vec3( + 4.0767416621 * l - 3.3077115913 * m + 0.2309699292 * s, + -1.2684380046 * l + 2.6097574011 * m - 0.3413193965 * s, + -0.0041960863 * l - 0.7034186147 * m + 1.7076147010 * s + ); + return vec4( + clamp(f(linear_srgb.r), 0.0, 1.0), + clamp(f(linear_srgb.g), 0.0, 1.0), + clamp(f(linear_srgb.b), 0.0, 1.0), + oklab.a + ); +} + +// Bloom samples from https://gist.github.com/qwerasd205/c3da6c610c8ffe17d6d2d3cc7068f17f +const vec3[24] samples = { + vec3(0.1693761725038636, 0.9855514761735895, 1), + vec3(-1.333070830962943, 0.4721463328627773, 0.7071067811865475), + vec3(-0.8464394909806497, -1.51113870578065, 0.5773502691896258), + vec3(1.554155680728463, -1.2588090085709776, 0.5), + vec3(1.681364377589461, 1.4741145918052656, 0.4472135954999579), + vec3(-1.2795157692199817, 2.088741103228784, 0.4082482904638631), + vec3(-2.4575847530631187, -0.9799373355024756, 0.3779644730092272), + vec3(0.5874641440200847, -2.7667464429345077, 0.35355339059327373), + vec3(2.997715703369726, 0.11704939884745152, 0.3333333333333333), + vec3(0.41360842451688395, 3.1351121305574803, 0.31622776601683794), + vec3(-3.167149933769243, 0.9844599011770256, 0.30151134457776363), + vec3(-1.5736713846521535, -3.0860263079123245, 0.2886751345948129), + vec3(2.888202648340422, -2.1583061557896213, 0.2773500981126146), + vec3(2.7150778983300325, 2.5745586041105715, 0.2672612419124244), + vec3(-2.1504069972377464, 3.2211410627650165, 0.2581988897471611), + vec3(-3.6548858794907493, -1.6253643308191343, 0.25), + vec3(1.0130775986052671, -3.9967078676335834, 0.24253562503633297), + vec3(4.229723673607257, 0.33081361055181563, 0.23570226039551587), + vec3(0.40107790291173834, 4.340407413572593, 0.22941573387056174), + vec3(-4.319124570236028, 1.159811599693438, 0.22360679774997896), + vec3(-1.9209044802827355, -4.160543952132907, 0.2182178902359924), + vec3(3.8639122286635708, -2.6589814382925123, 0.21320071635561041), + vec3(3.3486228404946234, 3.4331800232609, 0.20851441405707477), + vec3(-2.8769733643574344, 3.9652268864187157, 0.20412414523193154) +}; + +float offsetFunction(float iTime) { + float amount = 1.0; + const float periods[4] = {6.0, 16.0, 19.0, 27.0}; + for (int i = 0; i < 4; i++) { + amount *= 1.0 + 0.5 * sin(iTime*periods[i]); + } + //return amount; + return amount * periods[3]; +} + +const float DIM_CUTOFF = 0.35; +const float BRIGHT_CUTOFF = 0.65; +const float ABBERATION_FACTOR = 0.05; + +void mainImage(out vec4 fragColor, in vec2 fragCoord) { + vec2 uv = fragCoord.xy / iResolution.xy; + + // Sample the original color + vec4 originalColor = texture(iChannel0, uv); + + // Check if the pixel is part of the text (assuming alpha > 0.0) + if (originalColor.a > 0.0) { + float amount = offsetFunction(iTime); + + vec3 col; + col.r = texture( iChannel0, vec2(uv.x-ABBERATION_FACTOR*amount / iResolution.x, uv.y) ).r; + col.g = texture( iChannel0, uv ).g; + col.b = texture( iChannel0, vec2(uv.x+ABBERATION_FACTOR*amount / iResolution.x, uv.y) ).b; + + vec4 splittedColor = vec4(col, originalColor.a); // Keep the original alpha + vec4 source = toOklab(splittedColor); + vec4 dest = source; + + if (source.x > DIM_CUTOFF) { + dest.x *= 1.2; + // dest.x = 1.2; + } else { + vec2 step = vec2(1.414) / iResolution.xy; + vec3 glow = vec3(0.0); + for (int i = 0; i < 24; i++) { + vec3 s = samples[i]; + float weight = s.z; + vec4 c = toOklab(texture(iChannel0, uv + s.xy * step)); + if (c.x > DIM_CUTOFF) { + glow.yz += c.yz * weight * 0.3; + if (c.x <= BRIGHT_CUTOFF) { + glow.x += c.x * weight * 0.05; + } else { + glow.x += c.x * weight * 0.10; + } + } + } + // float lightness_diff = clamp(glow.x - dest.x, 0.0, 1.0); + // dest.x = lightness_diff; + // dest.yz = dest.yz * (1.0 - lightness_diff) + glow.yz * lightness_diff; + dest.xyz += glow.xyz; + } + + fragColor = toRgb(dest); + } else { + // If the pixel is background, set alpha to 0.0 for transparency + fragColor = vec4(originalColor.rgb, 0.0); + } +} diff --git a/home-manager/modules/ghostty/shaders/glow.glsl b/home-manager/modules/ghostty/shaders/glow.glsl new file mode 100644 index 0000000..83bef9c --- /dev/null +++ b/home-manager/modules/ghostty/shaders/glow.glsl @@ -0,0 +1,145 @@ +// First it does a "chromatic aberration" by splitting the rgb signals by a product of sin functions +// over time, then it does a glow effect in a perceptual color space +// Based on kalgynirae's Ghostty passable glow shader and NickWest's Chromatic Aberration shader demo +// Passable glow: https://github.com/kalgynirae/dotfiles/blob/main/ghostty/glow.glsl +// "Chromatic Aberration": https://www.shadertoy.com/view/Mds3zn + +// sRGB linear -> nonlinear transform from https://bottosson.github.io/posts/colorwrong/ +float f(float x) { + if (x >= 0.0031308) { + return 1.055 * pow(x, 1.0 / 2.4) - 0.055; + } else { + return 12.92 * x; + } +} + +float f_inv(float x) { + if (x >= 0.04045) { + return pow((x + 0.055) / 1.055, 2.4); + } else { + return x / 12.92; + } +} + +// Oklab <-> linear sRGB conversions from https://bottosson.github.io/posts/oklab/ +vec4 toOklab(vec4 rgb) { + vec3 c = vec3(f_inv(rgb.r), f_inv(rgb.g), f_inv(rgb.b)); + float l = 0.4122214708 * c.r + 0.5363325363 * c.g + 0.0514459929 * c.b; + float m = 0.2119034982 * c.r + 0.6806995451 * c.g + 0.1073969566 * c.b; + float s = 0.0883024619 * c.r + 0.2817188376 * c.g + 0.6299787005 * c.b; + float l_ = pow(l, 1.0 / 3.0); + float m_ = pow(m, 1.0 / 3.0); + float s_ = pow(s, 1.0 / 3.0); + return vec4( + 0.2104542553 * l_ + 0.7936177850 * m_ - 0.0040720468 * s_, + 1.9779984951 * l_ - 2.4285922050 * m_ + 0.4505937099 * s_, + 0.0259040371 * l_ + 0.7827717662 * m_ - 0.8086757660 * s_, + rgb.a + ); +} + +vec4 toRgb(vec4 oklab) { + vec3 c = oklab.rgb; + float l_ = c.r + 0.3963377774 * c.g + 0.2158037573 * c.b; + float m_ = c.r - 0.1055613458 * c.g - 0.0638541728 * c.b; + float s_ = c.r - 0.0894841775 * c.g - 1.2914855480 * c.b; + float l = l_ * l_ * l_; + float m = m_ * m_ * m_; + float s = s_ * s_ * s_; + vec3 linear_srgb = vec3( + 4.0767416621 * l - 3.3077115913 * m + 0.2309699292 * s, + -1.2684380046 * l + 2.6097574011 * m - 0.3413193965 * s, + -0.0041960863 * l - 0.7034186147 * m + 1.7076147010 * s + ); + return vec4( + clamp(f(linear_srgb.r), 0.0, 1.0), + clamp(f(linear_srgb.g), 0.0, 1.0), + clamp(f(linear_srgb.b), 0.0, 1.0), + oklab.a + ); +} + +// Bloom samples from https://gist.github.com/qwerasd205/c3da6c610c8ffe17d6d2d3cc7068f17f +const vec3[24] samples = { + vec3(0.1693761725038636, 0.9855514761735895, 1), + vec3(-1.333070830962943, 0.4721463328627773, 0.7071067811865475), + vec3(-0.8464394909806497, -1.51113870578065, 0.5773502691896258), + vec3(1.554155680728463, -1.2588090085709776, 0.5), + vec3(1.681364377589461, 1.4741145918052656, 0.4472135954999579), + vec3(-1.2795157692199817, 2.088741103228784, 0.4082482904638631), + vec3(-2.4575847530631187, -0.9799373355024756, 0.3779644730092272), + vec3(0.5874641440200847, -2.7667464429345077, 0.35355339059327373), + vec3(2.997715703369726, 0.11704939884745152, 0.3333333333333333), + vec3(0.41360842451688395, 3.1351121305574803, 0.31622776601683794), + vec3(-3.167149933769243, 0.9844599011770256, 0.30151134457776363), + vec3(-1.5736713846521535, -3.0860263079123245, 0.2886751345948129), + vec3(2.888202648340422, -2.1583061557896213, 0.2773500981126146), + vec3(2.7150778983300325, 2.5745586041105715, 0.2672612419124244), + vec3(-2.1504069972377464, 3.2211410627650165, 0.2581988897471611), + vec3(-3.6548858794907493, -1.6253643308191343, 0.25), + vec3(1.0130775986052671, -3.9967078676335834, 0.24253562503633297), + vec3(4.229723673607257, 0.33081361055181563, 0.23570226039551587), + vec3(0.40107790291173834, 4.340407413572593, 0.22941573387056174), + vec3(-4.319124570236028, 1.159811599693438, 0.22360679774997896), + vec3(-1.9209044802827355, -4.160543952132907, 0.2182178902359924), + vec3(3.8639122286635708, -2.6589814382925123, 0.21320071635561041), + vec3(3.3486228404946234, 3.4331800232609, 0.20851441405707477), + vec3(-2.8769733643574344, 3.9652268864187157, 0.20412414523193154) +}; + +float offsetFunction(float iTime) { + float amount = 1.0; + const float periods[4] = {6.0, 16.0, 19.0, 27.0}; + for (int i = 0; i < 4; i++) { + amount *= 1.0 + 0.5 * sin(iTime*periods[i]); + } + //return amount; + return amount * periods[3]; +} + +const float DIM_CUTOFF = 0.35; +const float BRIGHT_CUTOFF = 0.65; +const float ABBERATION_FACTOR = 0.05; + +void mainImage(out vec4 fragColor, in vec2 fragCoord) { + vec2 uv = fragCoord.xy / iResolution.xy; + + float amount = offsetFunction(iTime); + + vec3 col; + col.r = texture( iChannel0, vec2(uv.x-ABBERATION_FACTOR*amount / iResolution.x, uv.y) ).r; + col.g = texture( iChannel0, uv ).g; + col.b = texture( iChannel0, vec2(uv.x+ABBERATION_FACTOR*amount / iResolution.x, uv.y) ).b; + + vec4 splittedColor = vec4(col, 1.0); + vec4 source = toOklab(splittedColor); + vec4 dest = source; + + if (source.x > DIM_CUTOFF) { + dest.x *= 1.2; + // dest.x = 1.2; + } else { + vec2 step = vec2(1.414) / iResolution.xy; + vec3 glow = vec3(0.0); + for (int i = 0; i < 24; i++) { + vec3 s = samples[i]; + float weight = s.z; + vec4 c = toOklab(texture(iChannel0, uv + s.xy * step)); + if (c.x > DIM_CUTOFF) { + glow.yz += c.yz * weight * 0.3; + if (c.x <= BRIGHT_CUTOFF) { + glow.x += c.x * weight * 0.05; + } else { + glow.x += c.x * weight * 0.10; + } + } + } + // float lightness_diff = clamp(glow.x - dest.x, 0.0, 1.0); + // dest.x = lightness_diff; + // dest.yz = dest.yz * (1.0 - lightness_diff) + glow.yz * lightness_diff; + dest.xyz += glow.xyz; + dest.a = 0.5; + } + + fragColor = toRgb(dest); +} diff --git a/home-manager/modules/git/default.nix b/home-manager/modules/git/default.nix new file mode 100644 index 0000000..9dd52b3 --- /dev/null +++ b/home-manager/modules/git/default.nix @@ -0,0 +1,33 @@ +{ + config, + lib, + ... +}: let + cfg = config.lily.git; +in { + options.lily.git = { + enable = lib.mkEnableOption "activate git"; + }; + + config = lib.mkIf cfg.enable { + programs.git = { + enable = true; + lfs.enable = true; + extraConfig = { + user = { + name = "Lily"; + email = "Caznix01@gmail.com"; + signingKey = "Caznix"; + }; + commit.gpgsign = true; + init.defaultBranch = "main"; + merge = { + ff = "no"; + no-commit = "yes"; + }; + pull.ff = "only"; + push = {autoSetupRemote = true;}; + }; + }; + }; +} diff --git a/home-manager/modules/hyprland/default.nix b/home-manager/modules/hyprland/default.nix new file mode 100644 index 0000000..1651a5c --- /dev/null +++ b/home-manager/modules/hyprland/default.nix @@ -0,0 +1,116 @@ +{ + config, + lib, + pkgs, + ... +}: let + cfg = config.lily.hyprland; +in { + options.lily.hyprland = { + enable = lib.mkEnableOption "activate hyprland"; + }; + + config = lib.mkIf cfg.enable { + home.packages = with pkgs; [ + wl-clipboard + ]; + programs.kitty.enable = true; # required for the default Hyprland config + wayland.windowManager.hyprland = { + enable = true; + settings = { + decoration = { + rounding = 10; + # rounding_power = 2; + blur = { + enabled = true; + size = 10; + passes = 3; + popups = true; + + xray = true; + }; + }; + blurls = "waybar"; + dwindle = { + pseudotile = true; # Master switch for pseudotiling. Enabling is bound to mainMod + P in the keybinds section below + preserve_split = true; # You probably want this + }; + general = { + resize_on_border = true; # Enables resizing by dragging window borders + extend_border_grab_area = 15; # Extends the clickable area around the border for resizing + hover_icon_on_border = true; # Shows a cursor icon when + layout = "dwindle"; + "col.active_border" = "rgba(C55900ee) rgba(FFAA63ee) 45deg"; + "col.inactive_border" = "rgba(595959aa)"; + border_size = 2; + gaps_out = 10; + }; + exec-once = [ + "${pkgs.kdePackages.kwallet-pam}/libexec/pam_kwallet_init" + "${pkgs.networkmanagerapplet}/bin/nm-applet" + "${pkgs.blueman}/bin/blueman-applet" + ]; + "$super" = "SUPER"; + "$alt_super" = "CTRL"; + + bind = [ + "$super, Q, killactive" + "$alt_super $super,Q,exit" + # Screenshot region + "$super SHIFT,S, exec, GRIM_DEFAULT_DIR=${config.home.homeDirectory}/Pictures/Screenshots/ ${pkgs.grim}/bin/grim -g \"$(${pkgs.slurp}/bin/slurp)\" - | wl-copy " + "$super,T, exec, ghostty" + "$super, L,exec, hyprlock --immediate" + "$super, B,exec, chromium" + "$super,F,fullscreen" + "$super SHIFT,F,togglefloating" + "$super,E,exec,kate" + + "ALT,SPACE,exec, rofi -show drun" + "$super, P, pseudo," + + "$super, 1, workspace, 1" + "$super, 2, workspace, 2" + "$super, 3, workspace, 3" + "$super, 4, workspace, 4" + "$super, 5, workspace, 5" + "$super, 6, workspace, 6" + "$super, 7, workspace, 7" + "$super, 8, workspace, 8" + "$super, 9, workspace, 9" + "$super, 0, workspace, 10" + + # Move active window to a workspace iwth mainMod + SHIFT + j + "$super SHIFT, 1, movetoworkspace, 1" + "$super SHIFT, 2, movetoworkspace, 2" + "$super SHIFT, 3, movetoworkspace, 3" + "$super SHIFT, 4, movetoworkspace, 4" + "$super SHIFT, 5, movetoworkspace, 5" + "$super SHIFT, 6, movetoworkspace, 6" + "$super SHIFT, 7, movetoworkspace, 7" + "$super SHIFT, 8, movetoworkspace, 8" + "$super SHIFT, 9, movetoworkspace, 9" + "$super SHIFT, 0, movetoworkspace, 10" + + "$super, J, togglesplit" + + "$super, left, movefocus, l" + "$super, right, movefocus, r" + "$super, up, movefocus, u" + "$super, down, movefocus, d" + ]; + bindm = [ + "$super, mouse:272, movewindow" + "$super, mouse:273, resizewindow" + ]; + bindel = [ + ",XF86AudioRaiseVolume, exec, wpctl set-volume -l 1 @DEFAULT_AUDIO_SINK@ 5%+" + ",XF86AudioLowerVolume, exec, wpctl set-volume @DEFAULT_AUDIO_SINK@ 5%-" + ",XF86AudioMute, exec, wpctl set-mute @DEFAULT_AUDIO_SINK@ toggle" + ",XF86AudioMicMute, exec, wpctl set-mute @DEFAULT_AUDIO_SOURCE@ toggle" + ",XF86MonBrightnessUp, exec, ${pkgs.brightnessctl}/bin/brightnessctl s 10%+" + ",XF86MonBrightnessDown, exec, ${pkgs.brightnessctl}/bin/brightnessctl s 10%-" + ]; + }; + }; + }; +} diff --git a/home-manager/modules/neovim/colorscheme.nix b/home-manager/modules/neovim/colorscheme.nix new file mode 100644 index 0000000..20d2df5 --- /dev/null +++ b/home-manager/modules/neovim/colorscheme.nix @@ -0,0 +1,42 @@ +{...}: { + programs.nixvim = { + colorschemes.catppuccin = { + enable = true; + settings = { + flavour = "mocha"; + background = { + light = "latte"; + dark = "mocha"; + }; + transparent_background = true; + show_end_of_buffer = false; + term_colors = false; + dim_inactive.enabled = false; + no_italic = false; + no_bold = false; + styles = { + comments = ["italic"]; + conditionals = ["italic"]; + loops = null; + functions = null; + keywords = null; + strings = null; + variables = null; + numbers = null; + booleans = null; + properties = null; + types = null; + operators = null; + }; + integrations = { + cmp = true; + gitsigns = true; + nvimtree = true; + telescope = true; + notify = false; + mini = false; + }; + }; + }; + }; +} diff --git a/home-manager/modules/neovim/default.nix b/home-manager/modules/neovim/default.nix new file mode 100644 index 0000000..0876035 --- /dev/null +++ b/home-manager/modules/neovim/default.nix @@ -0,0 +1,32 @@ +{ + pkgs, + nixvim, + config, + lib, + ... +}: let + cfg = config.lily.neovim; +in { + imports = [ + # ./colorscheme.nix + ./plugins + ./keybinds.nix + ]; + options.lily.neovim = { + enable = lib.mkEnableOption "activate neovim"; + }; + config = lib.mkIf cfg.enable { + programs.nixvim = { + enable = true; + defaultEditor = true; + viAlias = true; + vimAlias = true; + vimdiffAlias = true; + + performance = { + byteCompileLua.enable = true; + combinePlugins = {}; + }; + }; + }; +} diff --git a/home-manager/modules/neovim/keybinds.nix b/home-manager/modules/neovim/keybinds.nix new file mode 100644 index 0000000..1ebf6ab --- /dev/null +++ b/home-manager/modules/neovim/keybinds.nix @@ -0,0 +1,32 @@ +{...}: { + programs.nixvim = { + globals = { + mapleader = " "; + maplocalleader = " "; + }; + keymaps = [ + { + mode = ["n" "v"]; + key = ""; + action = ""; + options.silent = true; + } + + { + mode = "n"; + key = ","; + action = "A,"; + options.silent = true; + } + { + mode = "n"; + key = "sf"; + action.__raw = "require('telescope.builtin').find_files"; + options = { + silent = true; + desc = "[S]earch [F]iles"; + }; + } + ]; + }; +} diff --git a/home-manager/modules/neovim/plugins/default.nix b/home-manager/modules/neovim/plugins/default.nix new file mode 100644 index 0000000..8031650 --- /dev/null +++ b/home-manager/modules/neovim/plugins/default.nix @@ -0,0 +1,24 @@ +{...}: { + imports = [ + ./telescope.nix + ./lualine.nix + ./treesitter.nix + ./gitsigns.nix + ./tree.nix + ./lsp + # ./dap.nix + ]; + programs.nixvim.plugins = { + sleuth.enable = true; + comment.enable = true; + indent-blankline.enable = true; + web-devicons.enable = true; + fugitive.enable = true; + markdown-preview.enable = true; + + git-worktree = { + enable = true; + enableTelescope = true; + }; + }; +} diff --git a/home-manager/modules/neovim/plugins/gitsigns.nix b/home-manager/modules/neovim/plugins/gitsigns.nix new file mode 100644 index 0000000..ac877f5 --- /dev/null +++ b/home-manager/modules/neovim/plugins/gitsigns.nix @@ -0,0 +1,45 @@ +{...}: { + programs.nixvim.plugins.gitsigns = { + enable = true; + settings = { + signs = { + add.text = "▎"; + change.text = "▎"; + delete.text = ""; + topdelete.text = ""; + changedelete.text = "▎"; + }; + + signs_staged_enable = true; + signcolumn = true; + numhl = false; + linehl = false; + word_diff = false; + watch_gitdir = { + interval = 1000; + follow_files = true; + }; + attach_to_untracked = true; + current_line_blame = false; + current_line_blame_opts = { + virt_text = true; + virt_text_pos = "eol"; + delay = 100; + ignore_whitespace = true; + }; + + current_line_blame_formatter = ", — "; + sign_priority = 6; + status_formatter = null; + update_debounce = 200; + max_file_length = 40000; + preview_config = { + border = "rounded"; + style = "minimal"; + relative = "cursor"; + row = 0; + col = 1; + }; + }; + }; +} diff --git a/home-manager/modules/neovim/plugins/lsp/cmp.nix b/home-manager/modules/neovim/plugins/lsp/cmp.nix new file mode 100644 index 0000000..cb9fa0f --- /dev/null +++ b/home-manager/modules/neovim/plugins/lsp/cmp.nix @@ -0,0 +1,85 @@ +{...}: { + programs.nixvim.plugins = { + cmp = { + autoEnableSources = false; + enable = true; + settings = { + snippet.expand = "function(args) require('luasnip').lsp_expand(args.body) end"; + formatting = { + fields = ["kind" "abbr" "menu"]; + format = '' + function(entry, vim_item) + local kind_icons = { + Text = "󰉿", + Method = "󰆧", + Function = "󰊕", + Constructor = "", + Field = " ", + Variable = "󰀫", + Class = "󰠱", + Interface = "", + Module = "", + Property = "󰜢", + Unit = "󰑭", + Value = "󰎠", + Enum = "", + Keyword = "󰌋", + Snippet = "", + Color = "󰏘", + File = "󰈙", + Reference = "", + Folder = "󰉋", + EnumMember = "", + Constant = "󰏿", + Struct = "", + Event = "", + Operator = "󰆕", + TypeParameter = " ", + Misc = " ", + } + vim_item.kind = string.format("%s", kind_icons[vim_item.kind]) + vim_item.abbr = vim_item.abbr .. " " .. (vim_item.menu and vim_item.menu or "") + if vim.fn.strchars(vim_item.abbr) > 50 then + vim_item.abbr = vim.fn.strcharpart(vim_item.abbr, 0, 50) .. "..." + end + vim_item.menu = ({ + nvim_lsp = "[LSP]", + luasnip = "[Snippet]", + buffer = "[Buffer]", + path = "[Path]" + })[entry.source.name] + return vim_item + end + ''; + }; + mapping.__raw = '' cmp.mapping.preset.insert({ + [""] = cmp.mapping.scroll_docs(-4), + [""] = cmp.mapping.scroll_docs(4), + [""] = cmp.mapping.complete(), + [""] = cmp.mapping.confirm({ + behavior = cmp.ConfirmBehavior.Replace, + select = true, + }), + [""] = cmp.mapping.select_prev_item(), + [""] = cmp.mapping.select_next_item(), + })''; + window = { + completion.__raw = "cmp.config.window.bordered()"; + documentation.__raw = "cmp.config.window.bordered()"; + }; + sources = [ + {name = "nvim_lsp";} + {name = "luasnip";} + {name = "path";} + {name = "buffer";} + {name = "crates";} + ]; + }; + }; + cmp_luasnip.enable = true; + cmp-buffer.enable = true; + cmp-path.enable = true; + cmp-nvim-lsp.enable = true; + luasnip.enable = true; + }; +} diff --git a/home-manager/modules/neovim/plugins/lsp/default.nix b/home-manager/modules/neovim/plugins/lsp/default.nix new file mode 100644 index 0000000..1b5ce1e --- /dev/null +++ b/home-manager/modules/neovim/plugins/lsp/default.nix @@ -0,0 +1,192 @@ +{pkgs, ...}: { + imports = [ + ./cmp.nix + ]; + programs.nixvim.plugins = { + crates.enable = true; # Does not work + dressing.enable = true; + }; + programs.nixvim.extraConfigVim = '' + augroup unrecognized_filetypes + autocmd! + autocmd BufRead,BufNewFile *.vert set filetype=glsl + autocmd BufRead,BufNewFile *.tesc set filetype=glsl + autocmd BufRead,BufNewFile *.tese set filetype=glsl + autocmd BufRead,BufNewFile *.frag set filetype=glsl + autocmd BufRead,BufNewFile *.geom set filetype=glsl + autocmd BufRead,BufNewFile *.comp set filetype=glsl + autocmd BufRead,BufNewFile *.qml set filetype=qml + autocmd BufRead,BufNewFile *.slint set filetype=slint + autocmd BufRead,BufNewFile *.typ set filetype=typst + augroup END + ''; + programs.nixvim.plugins.lsp = { + enable = true; + + capabilities = '' + capabilities = require('cmp_nvim_lsp').default_capabilities(capabilities) + capabilities.textDocument.completion.completionItem.snippetSupport = true''; + preConfig = '' + local border = { + { "╭", "FloatBorder" }, + { "─", "FloatBorder" }, + { "╮", "FloatBorder" }, + { "│", "FloatBorder" }, + { "╯", "FloatBorder" }, + { "─", "FloatBorder" }, + { "╰", "FloatBorder" }, + { "│", "FloatBorder" } + } + vim.lsp.handlers["textDocument/hover"] = vim.lsp.with(vim.lsp.handlers.hover, { border = border }) + vim.lsp.handlers["textDocument/signatureHelp"] = vim.lsp.with(vim.lsp.handlers.signature_help, { border = border }) + ''; + + inlayHints = true; + servers = { + clangd = { + enable = true; + settings.arguments = [ + "--clang-tidy" + "--background-index" + "--completion-style=detailed" + "--cross-file-rename" + "--header-insertion=iwyu" + "--all-scopes-completion" + ]; + }; + # jdtls.enable = true; + emmet_ls.enable = true; + ts_ls.enable = true; + cssls.enable = true; + # glsl_analyzer.enable = true; + glslls.enable = true; + pyright.enable = true; + nixd.enable = true; + lua_ls = { + enable = true; + settings = { + telemetry.enable = false; + workspace.checkThirdParty = false; + }; + }; + svelte = { + enable = true; + settings.enable_ts_plugin = true; + }; + slint_lsp.enable = true; + zls.enable = true; + rust_analyzer = { + enable = true; + installRustc = false; + installCargo = false; + settings = { + imports = { + granularity.group = "crate"; + prefix = "self"; + preferNoStd = true; + }; + check = { + command = "clippy"; + allTargets = true; + }; + completion = { + fullFunctionSignatures.enable = false; + autoimport.enable = true; + }; + cargo = { + allTargets = true; + features = "all"; + }; + procMacro.enable = true; + }; + }; + }; + keymaps = { + silent = true; + extra = [ + { + mode = "n"; + key = "rn"; + action.__raw = "vim.lsp.buf.rename"; + } + { + mode = "n"; + key = "ca"; + action.__raw = "vim.lsp.buf.code_action"; + } + { + mode = "n"; + key = "di"; + action.__raw = "vim.diagnostic.open_float"; + } + { + mode = "n"; + key = "dv"; + action.__raw = "require('telescope.builtin').diagnostics"; + } + + { + mode = "n"; + key = "gd"; + action.__raw = "vim.lsp.buf.definition"; + } + { + mode = "n"; + key = "gr"; + action.__raw = "require('telescope.builtin').lsp_references"; + } + { + mode = "n"; + key = "gI"; + action.__raw = "vim.lsp.buf.implementation"; + } + { + mode = "n"; + key = "D"; + action.__raw = "vim.lsp.buf.type_definition"; + } + { + mode = "n"; + key = "ds"; + action.__raw = "require('telescope.builtin').lsp_document_symbols"; + } + { + mode = "n"; + key = "ws"; + action.__raw = "require('telescope.builtin').lsp_dynamic_workspace_symbols"; + } + { + mode = "n"; + key = "K"; + action.__raw = "vim.lsp.buf.hover"; + } + { + mode = "n"; + key = "k"; + action.__raw = "vim.lsp.buf.signature_help"; + } + + { + mode = "n"; + key = "gD"; + action.__raw = "vim.lsp.buf.declaration"; + } + { + mode = "n"; + key = "wa"; + action.__raw = "vim.lsp.buf.add_workspace_folder"; + } + { + mode = "n"; + key = "wr"; + action.__raw = "vim.lsp.buf.remove_workspace_folder"; + } + { + mode = "n"; + key = "wl"; + action.__raw = "function() print(vim.inspect(vim.lsp.buf.list_workspace_folders())) end"; + } + ]; + }; + }; +} diff --git a/home-manager/modules/neovim/plugins/lualine.nix b/home-manager/modules/neovim/plugins/lualine.nix new file mode 100644 index 0000000..a56b133 --- /dev/null +++ b/home-manager/modules/neovim/plugins/lualine.nix @@ -0,0 +1,21 @@ +{...}: { + programs.nixvim.plugins.lualine = { + enable = true; + settings = { + options = { + icons_enabled = true; + component_seperators = { + left = "|"; + right = "|"; + }; + section_seperators = { + left = ""; + right = ""; + }; + disabled_filetypes.statusline = ["NvimTree" "alpha"]; + disabled_filetypes.winbar = ["NvimTree" "alpha"]; + theme = null; + }; + }; + }; +} diff --git a/home-manager/modules/neovim/plugins/telescope.nix b/home-manager/modules/neovim/plugins/telescope.nix new file mode 100644 index 0000000..1a3c2de --- /dev/null +++ b/home-manager/modules/neovim/plugins/telescope.nix @@ -0,0 +1,47 @@ +{...}: { + programs.nixvim.plugins.telescope = { + enable = true; + extensions = { + fzf-native.enable = true; + file-browser.enable = true; + }; + settings = { + theme = "dropdown"; + defaults = { + prompt_prefix = " "; + selection_caret = " "; + entry_prefix = " "; + initial_mode = "insert"; + selection_strategy = "reset"; + layout_config = {}; + mappings.i = { + "" = false; + "" = false; + }; + file_ignore_patters = {}; + path_display = "smart"; + winblend = 0; + border = {}; + borderchars = null; + color_devicons = true; + set_env = {COLORTERM = "truecolor";}; + }; + pickers = { + planets = { + show_pluto = true; + show_moon = true; + }; + git_files = { + hidden = true; + show_untracked = true; + }; + colorscheme = { + enable_preview = true; + }; + find_files = { + hidden = true; + }; + }; + }; + }; +} diff --git a/home-manager/modules/neovim/plugins/tree.nix b/home-manager/modules/neovim/plugins/tree.nix new file mode 100644 index 0000000..98c3779 --- /dev/null +++ b/home-manager/modules/neovim/plugins/tree.nix @@ -0,0 +1,17 @@ +{ + programs.nixvim.plugins.nvim-tree = { + enable = true; + disableNetrw = true; + hijackNetrw = true; + diagnostics.enable = true; + preferStartupRoot = false; + syncRootWithCwd = true; + view = { + side = "left"; + width = 30; + }; + renderer.groupEmpty = true; + actions.openFile.resizeWindow = true; + git.ignore = false; + }; +} diff --git a/home-manager/modules/neovim/plugins/treesitter.nix b/home-manager/modules/neovim/plugins/treesitter.nix new file mode 100644 index 0000000..96f94ab --- /dev/null +++ b/home-manager/modules/neovim/plugins/treesitter.nix @@ -0,0 +1,19 @@ +{config, ...}: { + programs.nixvim.plugins.treesitter = { + enable = true; + nixvimInjections = true; + settings = { + indent.enable = true; + incremental_selection = { + enable = true; + # keymaps = { + # init_selection = ""; + # node_incremental = ""; + # scope_incremental = " C++ == 1 - ;;clojure ; java with a lisp - ;;common-lisp ; if you've seen one lisp, you've seen them all - ;;coq ; proofs-as-programs - ;;crystal ; ruby at the speed of c - ;;csharp ; unity, .NET, and mono shenanigans - ;;data ; config/data formats - ;;(dart +flutter) ; paint ui and not much else - ;;dhall - ;;elixir ; erlang done right - ;;elm ; care for a cup of TEA? - emacs-lisp ; drown in parentheses - ;;erlang ; an elegant language for a more civilized age - ;;ess ; emacs speaks statistics - ;;factor - ;;faust ; dsp, but you get to keep your soul - ;;fortran ; in FORTRAN, GOD is REAL (unless declared INTEGER) - ;;fsharp ; ML stands for Microsoft's Language - ;;fstar ; (dependent) types and (monadic) effects and Z3 - ;;gdscript ; the language you waited for - ;;(go +lsp) ; the hipster dialect - ;;(graphql +lsp) ; Give queries a REST - (haskell +lsp) ; a language that's lazier than I am - ;;hy ; readability of scheme w/ speed of python - ;;idris ; a language you can depend on - ;;json ; At least it ain't XML - ;;(java +lsp) ; the poster child for carpal tunnel syndrome - ;;javascript ; all(hope(abandon(ye(who(enter(here)))))) - ;;julia ; a better, faster MATLAB - ;;kotlin ; a better, slicker Java(Script) - latex ; writing papers in Emacs has never been so fun - ;;lean ; for folks with too much to prove - ;;ledger ; be audit you can be - ;;lua ; one-based indices? one-based indices - markdown ; writing docs for people to ignore - ;;nim ; python + lisp at the speed of c - nix ; I hereby declare "nix geht mehr!" - ;;ocaml ; an objective camel - org ; organize your plain life in plain text - ;;php ; perl's insecure younger brother - ;;plantuml ; diagrams for confusing people more - ;;purescript ; javascript, but functional - python ; beautiful is better than ugly - ;;qt ; the 'cutest' gui framework ever - ;;racket ; a DSL for DSLs - ;;raku ; the artist formerly known as perl6 - ;;rest ; Emacs as a REST client - ;;rst ; ReST in peace - ;;(ruby +rails) ; 1.step {|i| p "Ruby is #{i.even? ? 'love' : 'life'}"} - (rust +lsp) ; Fe2O3.unwrap().unwrap().unwrap().unwrap() - ;;scala ; java, but good - ;;(scheme +guile) ; a fully conniving family of lisps - sh ; she sells {ba,z,fi}sh shells on the C xor - ;;sml - ;;solidity ; do you need a blockchain? No. - ;;swift ; who asked for emoji variables? - ;;terra ; Earth and Moon in alignment for performance. - ;;web ; the tubes - ;;yaml ; JSON, but readable - ;;zig ; C, but simpler - - :email - ;;(mu4e +org +gmail) - ;;notmuch - ;;(wanderlust +gmail) - - :app - ;;calendar - ;;emms - ;;everywhere ; *leave* Emacs!? You must be joking - ;;irc ; how neckbeards socialize - ;;(rss +org) ; emacs as an RSS reader - - :config - ;;literate - (default +bindings +smartparens)) diff --git a/home-manager/packages/doom-emacs/.doom.d/packages.el b/home-manager/packages/doom-emacs/.doom.d/packages.el deleted file mode 100644 index 4047ab8..0000000 --- a/home-manager/packages/doom-emacs/.doom.d/packages.el +++ /dev/null @@ -1,63 +0,0 @@ -;; -*- no-byte-compile: t; -*- -;;; $DOOMDIR/packages.el - -;; To install a package with Doom you must declare them here and run 'doom sync' -;; on the command line, then restart Emacs for the changes to take effect -- or -;; use 'M-x doom/reload'. - - -;; To install SOME-PACKAGE from MELPA, ELPA or emacsmirror: -;; (package! some-package) - -;; To install a package directly from a remote git repo, you must specify a -;; `:recipe'. You'll find documentation on what `:recipe' accepts here: -;; https://github.com/radian-software/straight.el#the-recipe-format -;; (package! another-package -;; :recipe (:host github :repo "username/repo")) - -;; If the package you are trying to install does not contain a PACKAGENAME.el -;; file, or is located in a subdirectory of the repo, you'll need to specify -;; `:files' in the `:recipe': -;; (package! this-package -;; :recipe (:host github :repo "username/repo" -;; :files ("some-file.el" "src/lisp/*.el"))) - -;; If you'd like to disable a package included with Doom, you can do so here -;; with the `:disable' property: -;; (package! builtin-package :disable t) - -;; You can override the recipe of a built in package without having to specify -;; all the properties for `:recipe'. These will inherit the rest of its recipe -;; from Doom or MELPA/ELPA/Emacsmirror: -;; (package! builtin-package :recipe (:nonrecursive t)) -;; (package! builtin-package-2 :recipe (:repo "myfork/package")) - -;; Specify a `:branch' to install a package from a particular branch or tag. -;; This is required for some packages whose default branch isn't 'master' (which -;; our package manager can't deal with; see radian-software/straight.el#279) -;; (package! builtin-package :recipe (:branch "develop")) - -;; Use `:pin' to specify a particular commit to install. -;; (package! builtin-package :pin "1a2b3c4d5e") - - -;; Doom's packages are pinned to a specific commit and updated from release to -;; release. The `unpin!' macro allows you to unpin single packages... -;; (unpin! pinned-package) -;; ...or multiple packages -;; (unpin! pinned-package another-pinned-package) -;; ...Or *all* packages (NOT RECOMMENDED; will likely break things) -;; (unpin! t) - -(package! elcord) -(package! catppuccin-theme) -(package! org-view-mode) -(package! org-superstar) -(package! lsp-ui) -(package! svelte-mode) -(package! typescript-mode) - -(setq lsp-log-io t) -(add-hook 'org-mode-hook - (lambda () - (org-superstar-mode 1))) diff --git a/home-manager/packages/doom-emacs/.gitignore b/home-manager/packages/doom-emacs/.gitignore deleted file mode 100644 index 6daab5a..0000000 --- a/home-manager/packages/doom-emacs/.gitignore +++ /dev/null @@ -1 +0,0 @@ -!.doom.d/ diff --git a/home-manager/packages/emacs.nix b/home-manager/packages/emacs.nix deleted file mode 100644 index 6d1e57d..0000000 --- a/home-manager/packages/emacs.nix +++ /dev/null @@ -1,23 +0,0 @@ -{ pkgs, config, lib, ... }: - -{ - programs.emacs = { - enable = true; - package = pkgs.emacs; - }; - - home.activation = { - cloneDoomEmacs = '' - if [ ! -d "$HOME/.emacs.d" ]; then - ${pkgs.git}/bin/git clone https://github.com/doomemacs/doomemacs $HOME/.emacs.d - fi - ''; - }; - - home.file.".doom.d" = { - source = ./doom-emacs/.doom.d; - recursive = true; - onChange = "${config.home.homeDirectory}/.emacs.d/bin/doom sync"; - force = true; - }; -} diff --git a/home-manager/packages/git.nix b/home-manager/packages/git.nix deleted file mode 100644 index 707417f..0000000 --- a/home-manager/packages/git.nix +++ /dev/null @@ -1,22 +0,0 @@ -{ ... }: - -{ - programs.git = { - enable = true; - userName = "luxzi"; - userEmail = "lesson085@gmail.com"; - aliases = { - pf = "push --force"; - kl = "log --show-signature"; - }; - signing = { - key = "C90237A70F2FDD53"; - signByDefault = true; - }; - extraConfig = { - init.defaultBranch = "main"; - core.symlinks = true; - commit.gpgsign = true; - }; - }; -} diff --git a/home-manager/packages/kitty.nix b/home-manager/packages/kitty.nix deleted file mode 100644 index b071f86..0000000 --- a/home-manager/packages/kitty.nix +++ /dev/null @@ -1,17 +0,0 @@ -{ pkgs, ... }: - -{ - programs.kitty = { - enable = true; - font = { - name = "FiraCode Nerd Font"; - package = pkgs.nerd-fonts.fira-code; - size = 14; - }; - settings = { - window_padding_width = 4; - background_opacity = "0.65"; - background_blur = 1; - }; - }; -} diff --git a/home-manager/packages/packages.nix b/home-manager/packages/packages.nix deleted file mode 100644 index eefd3b9..0000000 --- a/home-manager/packages/packages.nix +++ /dev/null @@ -1,30 +0,0 @@ -{ pkgs, ... }: - -{ - imports = - [ - ./zsh.nix - ./git.nix - ./emacs.nix - ./kitty.nix - ]; - - home.packages = with pkgs; [ - hyfetch - nix-output-monitor - firefox - tree - vesktop - fzf - tor-browser - nix-search-cli - mpv - element-desktop - mission-center - nvtop - alacritty - nerd-fonts.fira-code - ]; - - nixpkgs.config.allowUnfree = true; -} diff --git a/home-manager/packages/zsh.nix b/home-manager/packages/zsh.nix deleted file mode 100644 index 956dd25..0000000 --- a/home-manager/packages/zsh.nix +++ /dev/null @@ -1,99 +0,0 @@ -{ ... }: - -{ - programs.zsh = { - enable = true; - enableCompletion = true; - autosuggestion.enable = true; - syntaxHighlighting.enable = true; - autocd = true; - shellAliases = { - hm-switch = "home-manager switch --flake $HOME/.dotfiles"; - nx-switch = "sudo nixos-rebuild switch --flake $HOME/.dotfiles"; - nx-boot = "sudo nixos-rebuild boot --flake $HOME/.dotfiles"; - nx-clean = "sudo nix-collect-garbage --delete-old && nix-collect-garbage --delete-old"; - hm-clean = "home-manager remove-generations"; - gl-switch = "sudo nixos-rebuild switch --flake $HOME/.dotfiles && home-manager switch --flake $HOME/.dotfiles"; - gl-clean = "sudo nix-collect-garbage --delete-old && nix-collect-garbage --delete-old && home-manager remove-generations"; - snv = "sudo -E nvim"; - sen = "sudo -E"; - emacs-config = "emacs --chdir $HOME/.dotfiles/home-manager/packages/doom-emacs/.doom.d &"; - }; - - zplug = { - enable = true; - plugins = [ - { name = "Aloxaf/fzf-tab"; } - ]; - }; - - history = { - size = 5000; - save = 5000; - ignoreAllDups = true; - ignoreDups = true; - ignoreSpace = true; - share = true; - }; - - initExtra = '' - bindkey -v - bindkey '^k' history-search-backward - bindkey '^j' history-search-forward - setopt appendHistory - zstyle ':completion:*' matcher-list 'm:{a-z}={A-Za-z}' - zstyle ':completion:*' menu no - zstyle ':fzf-tab:complete:cd:*' fzf-preview 'ls --color $realpath' - eval "$(fzf --zsh)" - ''; - }; - - programs.starship = { - enable = true; - settings = { - format = "$username$hostname$directory$git_branch$git_state$git_status$nix_shell$cmd_duration$line_break$python$character"; - - directory = { - style = "blue"; - }; - - character = { - success_symbol = "[❯](white)"; - error_symbol = "[❯](red)"; - vimcmd_symbol = "[❮](green)"; - }; - - git_branch = { - format = "[$branch]($style)"; - style = "green"; - }; - - git_status = { - format = "[[($conflicted$untracked$modified$staged$renamed$deleted)](218) ($ahead_behind$stashed)]($style)"; - style = "cyan"; - conflicted = "!"; - untracked = "​u"; - modified = "​*"; - staged = "​+"; - renamed = "r"; - deleted = "d"; - stashed = "≡"; - }; - - git_state = { - format = "\([$state( $progress_current/$progress_total)]($style)\) "; - style = "bright-black"; - }; - - cmd_duration = { - format = "[$duration]($style) "; - style = "yellow"; - }; - - python = { - format = "[$virtualenv]($style) "; - style = "bright-black"; - }; - }; - }; -} diff --git a/home-manager/profiles/desktop.nix b/home-manager/profiles/desktop.nix new file mode 100644 index 0000000..00cfd63 --- /dev/null +++ b/home-manager/profiles/desktop.nix @@ -0,0 +1,22 @@ +{pkgs, ...}: { + imports = [ + ./main.nix + ]; + programs.direnv = { + enable = true; + nix-direnv.enable = true; + }; + lily = { + hyprland.enable = true; + ghostty.enable = true; + neovim.enable = true; + rofi.enable = true; + vscode.enable = true; + zed.enable = true; + waybar.enable = true; + chromium.enable = true; + }; + home.packages = with pkgs; [ + vesktop + ]; +} diff --git a/home-manager/profiles/main.nix b/home-manager/profiles/main.nix new file mode 100644 index 0000000..b252192 --- /dev/null +++ b/home-manager/profiles/main.nix @@ -0,0 +1,10 @@ +{pkgs, ...}: { + home.stateVersion = "24.11"; + programs.home-manager.enable = true; + nixpkgs.config.allowUnfree = true; + + lily = { + zsh.enable = true; + git.enable = true; + }; +} diff --git a/machines/nix/configuration.nix b/machines/nix/configuration.nix new file mode 100644 index 0000000..05600e5 --- /dev/null +++ b/machines/nix/configuration.nix @@ -0,0 +1,79 @@ +# This is your system's configuration file. +# Use this to configure your system environment (it replaces /etc/nixos/configuration.nix) +{...}: { + inputs, + outputs, + lib, + config, + pkgs, + flake-self, + ... +}: { + # You can import other NixOS modules here + imports = [ + # Or modules from other flakes (such as nixos-hardware): + # inputs.hardware.nixosModules.common-cpu-amd + # inputs.hardware.nixosModules.common-ssd + + # inputs.home-manager.nixosModules.home-manager + # inputs.nix-gaming.nixosModules.platformOptimizations + + # Import your generated (nixos-generate-config) hardware configuration + ./hardware-configuration.nix + # ../common.nix + # ./plymouth.nix + ]; + lily = { + users.lily.enable = true; + laptop.enable = true; + common.enable = true; + containers = { + enable = true; + podman = true; + # docker = false; + }; + nvidia.enable = true; + desktop = { + enable = true; + hyprland.enable = true; + plasma.enable = true; + }; + }; + networking.hostName = "nix"; + + boot = { + loader = { + systemd-boot.enable = true; + efi.canTouchEfiVariables = true; + timeout = 0; + }; + consoleLogLevel = 0; + initrd.verbose = false; + kernelPackages = pkgs.linuxPackages_lqx; + kernelParams = [ + "quiet" + "splash" + ]; + }; + + programs = { + steam = { + enable = true; + remotePlay.openFirewall = true; + dedicatedServer.openFirewall = true; + platformOptimizations.enable = true; + localNetworkGameTransfers.openFirewall = true; + gamescopeSession.enable = true; + extraCompatPackages = let gamePkgs = inputs.nix-gaming.packages.${pkgs.hostPlatform.system}; in [pkgs.proton-ge-bin gamePkgs.northstar-proton]; + }; + }; + + home-manager = { + users = { + lily = flake-self.homeConfigurations.lily; + }; + }; + + # https://nixos.wiki/wiki/FAQ/When_do_I_update_stateVersion + # system.stateVersion = "24.11"; +} diff --git a/machines/nix/hardware-configuration.nix b/machines/nix/hardware-configuration.nix new file mode 100644 index 0000000..6be9341 --- /dev/null +++ b/machines/nix/hardware-configuration.nix @@ -0,0 +1,45 @@ +# 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" "thunderbolt" "nvme" "usb_storage" "usbhid" "sd_mod" "rtsx_pci_sdmmc"]; + boot.initrd.kernelModules = []; + boot.kernelModules = ["kvm-intel"]; + boot.extraModulePackages = []; + + fileSystems."/" = { + device = "/dev/disk/by-uuid/95c3ec11-8329-4b54-a690-97c31250a110"; + fsType = "btrfs"; + options = ["subvol=@"]; + }; + + fileSystems."/boot" = { + device = "/dev/disk/by-uuid/9666-823F"; + fsType = "vfat"; + options = ["fmask=0077" "dmask=0077"]; + }; + + swapDevices = [ + {device = "/dev/disk/by-uuid/5fd02c5b-4ce0-46be-8771-9c1b0d280d8d";} + ]; + + # 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.wlp92s0.useDHCP = lib.mkDefault true; + + nixpkgs.hostPlatform = lib.mkDefault "x86_64-linux"; + hardware.cpu.intel.updateMicrocode = lib.mkDefault config.hardware.enableRedistributableFirmware; +} diff --git a/machines/nix/plymouth.nix b/machines/nix/plymouth.nix new file mode 100644 index 0000000..3dd9c93 --- /dev/null +++ b/machines/nix/plymouth.nix @@ -0,0 +1,31 @@ +{pkgs, ...}: { + boot = { + plymouth = { + enable = true; + theme = "bgrt"; + #themePackages = with pkgs; [ + # By default we would install all themes + #(adi1090x-plymouth-themes.override { + # selected_themes = [ "bgrt" ]; + #}) + #]; + }; + + # Enable "Silent Boot" + consoleLogLevel = 0; + initrd.verbose = false; + kernelParams = [ + "quiet" + "splash" + "boot.shell_on_fail" + "loglevel=3" + "rd.systemd.show_status=false" + "rd.udev.log_level=3" + "udev.log_priority=3" + ]; + # Hide the OS choice for bootloaders. + # It's still possible to open the bootloader list by pressing any key + # It will just not appear on screen unless a key is pressed + loader.timeout = 0; + }; +} diff --git a/modules/common/common.nix b/modules/common/common.nix new file mode 100644 index 0000000..f8dd76f --- /dev/null +++ b/modules/common/common.nix @@ -0,0 +1,47 @@ +{ + config, + lib, + pkgs, + ... +}: let + cfg = config.lily.common; +in { + options.lily.common.enable = lib.mkEnableOption "activate common"; + config = lib.mkIf cfg.enable { + programs.gnupg.agent = { + enable = true; + enableSSHSupport = true; + }; + services.openssh.enable = true; + programs.zsh.enable = true; + environment.systemPackages = with pkgs; [ + git + neovim + toybox + util-linux + tmux + ghostty + + # encryption and filesystem + cryptsetup + age + + # network tools + wget + curl + # FS-tools + unzip + gnutar + xz + bzip2 + p7zip + + netcat-gnu + dnsutils + fd + file + tree + ]; + environment.shells = with pkgs; [zsh]; + }; +} diff --git a/modules/common/default.nix b/modules/common/default.nix new file mode 100644 index 0000000..4181c63 --- /dev/null +++ b/modules/common/default.nix @@ -0,0 +1,17 @@ +{lib, ...}: let + # recursively construct attr-set of a directory + getDir = dir: + lib.mapAttrs (file: type: + if type == "directory" + then getDir "${dir}/${file}" + else type) ( + builtins.readDir dir + ); + files = dir: lib.collect lib.isString (lib.mapAttrsRecursive (path: type: lib.concatStringsSep "/" path) (getDir dir)); + validFiles = dir: + map (file: ./. + "/${file}") ( + lib.filter (file: lib.hasSuffix ".nix" file && file != "default.nix") (files dir) + ); +in { + imports = validFiles ./.; +} diff --git a/modules/common/desktop.nix b/modules/common/desktop.nix new file mode 100644 index 0000000..8d83f6d --- /dev/null +++ b/modules/common/desktop.nix @@ -0,0 +1,82 @@ +{ + pkgs, + lib, + config, + flake-self, + ... +}: let + cfg = config.lily.desktop; +in { + options.lily.desktop = { + enable = lib.mkEnableOption "activate desktop"; + plasma.enable = lib.mkEnableOption "activate plasma desktop environment"; + hyprland.enable = lib.mkEnableOption "activate hyprland desktop"; + }; + + config = lib.mkIf cfg.enable { + lily = { + plasma.enable = cfg.plasma.enable; + hyprland.enable = cfg.hyprland.enable; + }; + programs = { + dconf.enable = true; + kdeconnect.enable = true; + }; + environment.systemPackages = with pkgs; [ + vulkan-tools + jq + libqalculate + envsubst + glib + headsetcontrol + ]; + networking = { + networkmanager.enable = true; + }; + + fonts = { + enableDefaultPackages = true; + packages = with pkgs; [ + jetbrains-mono + noto-fonts-color-emoji + garamond-libre + helvetica-neue-lt-std + # nerd-fonts.jetbrains-mono + ]; + fontDir.enable = true; + fontconfig = { + defaultFonts = { + monospace = ["JetBrainsMono Bold"]; + serif = ["Garamond Libre"]; + sansSerif = ["Helvetica Neue LT Std"]; + emoji = ["Noto Color Emoji"]; + }; + }; + }; + + security.rtkit.enable = true; + services.pipewire = { + enable = true; + alsa = { + enable = true; + support32Bit = true; + }; + audio.enable = true; + wireplumber.enable = true; + pulse.enable = true; + jack.enable = true; + }; + + # services.printing.enable = true; + # services.flatpak.enable = true; + services.avahi = { + enable = true; + nssmdns4 = true; + openFirewall = true; + }; + services.udev.packages = [pkgs.headsetcontrol]; + # environment.sessionVariables = { + # MOZ_DISABLE_RDD_SANDBOX = "1"; + # }; + }; +} diff --git a/modules/common/locale.nix b/modules/common/locale.nix new file mode 100644 index 0000000..fbe8f00 --- /dev/null +++ b/modules/common/locale.nix @@ -0,0 +1,18 @@ +{...}: { + # Select internationalisation properties. + i18n = { + defaultLocale = "en_US.UTF-8"; + extraLocaleSettings = { + LC_ADDRESS = "en_US.UTF-8"; + LC_IDENTIFICATION = "en_US.UTF-8"; + LC_MEASUREMENT = "en_US.UTF-8"; + LC_MONETARY = "en_US.UTF-8"; + LC_NAME = "en_US.UTF-8"; + LC_NUMERIC = "en_US.UTF-8"; + LC_PAPER = "en_US.UTF-8"; + LC_TELEPHONE = "en_US.UTF-8"; + LC_TIME = "en_US.UTF-8"; + }; + }; + time.timeZone = "America/Detroit"; +} diff --git a/modules/common/nixcommon.nix b/modules/common/nixcommon.nix new file mode 100644 index 0000000..9156239 --- /dev/null +++ b/modules/common/nixcommon.nix @@ -0,0 +1,49 @@ +{ + inputs, + outputs, + config, + pkgs, + ... +}: { + nixpkgs.config.allowUnfree = true; + + home-manager = { + extraSpecialArgs = {inherit inputs outputs;}; + useGlobalPkgs = true; + useUserPackages = true; + }; + + nix = { + nixPath = ["nixpkgs=${inputs.nixpkgs}"]; + package = pkgs.nixVersions.stable; + optimise.automatic = true; + gc = { + persistent = true; + automatic = true; + }; + extraOptions = '' + # If set to true, Nix will fall back to building from source if a binary substitute fails. + fallback = true + # the timeout (in seconds) for establishing connections in the binary cache substituter. + connect-timeout = 10 + # these log lines are only shown on a failed build + log-lines = 25 + ''; + settings = { + auto-optimise-store = true; + + trusted-users = ["root" "@wheel"]; + experimental-features = [ + "nix-command" + "flakes" + ]; + }; + }; + # 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 + # this value at the release version of the first install of this system. + # Before changing this value read the documentation for this option + # (e.g. man configuration.nix or on https://nixos.org/nixos/options.html). + system.stateVersion = "24.11"; +} diff --git a/modules/containers/default.nix b/modules/containers/default.nix new file mode 100644 index 0000000..5786d90 --- /dev/null +++ b/modules/containers/default.nix @@ -0,0 +1,48 @@ +{ + pkgs, + lib, + config, + ... +}: let + cfg = config.lily.containers; +in { + options.lily.containers = { + enable = lib.mkEnableOption "activate containers"; + docker = lib.mkEnableOption "activate docker"; + podman = lib.mkEnableOption "activate podman"; + }; + + config = lib.mkMerge [ + # (lib.mkIf (cfg.enable && cfg.docker && cfg.podman) + # (builtins.throw "You can't enable both docker and podman at the same time")) + { + assertions = [ + { + assertion = !(cfg.docker && cfg.podman); + message = "You cannot enable docker and podman at the same time"; + } + ]; + } + (lib.mkIf (cfg.enable && cfg.docker) { + # Enable docker support: + virtualisation.containers.enable = true; + virtualisation.docker.enable = true; + }) + (lib.mkIf (cfg.enable && cfg.podman) { + # Enable podman support: + virtualisation.containers.enable = true; + virtualisation.podman = { + enable = true; + dockerCompat = true; + dockerSocket.enable = true; + defaultNetwork.settings = { + dns_enabled = true; + }; + }; + environment.systemPackages = with pkgs; [ + podman + podman-compose + ]; + }) + ]; +} diff --git a/modules/fileshare/default.nix b/modules/fileshare/default.nix new file mode 100644 index 0000000..4181c63 --- /dev/null +++ b/modules/fileshare/default.nix @@ -0,0 +1,17 @@ +{lib, ...}: let + # recursively construct attr-set of a directory + getDir = dir: + lib.mapAttrs (file: type: + if type == "directory" + then getDir "${dir}/${file}" + else type) ( + builtins.readDir dir + ); + files = dir: lib.collect lib.isString (lib.mapAttrsRecursive (path: type: lib.concatStringsSep "/" path) (getDir dir)); + validFiles = dir: + map (file: ./. + "/${file}") ( + lib.filter (file: lib.hasSuffix ".nix" file && file != "default.nix") (files dir) + ); +in { + imports = validFiles ./.; +} diff --git a/modules/fileshare/samba.nix b/modules/fileshare/samba.nix new file mode 100644 index 0000000..6e21f88 --- /dev/null +++ b/modules/fileshare/samba.nix @@ -0,0 +1,55 @@ +{ + config, + lib, + ... +}: let + cfg = config.lily.fileshare; +in { + options.lily.fileshare.enable = lib.mkEnableOption "activate local filesharing"; + + config = lib.mkIf cfg.enable { + services.samba = { + enable = true; + securityType = "user"; #Keep user, but use guest account. + openFirewall = true; + settings = { + global = { + workgroup = "WORKGROUP"; #Ensure this matches your network's workgroup. + "server string" = "smbnix"; + "netbios name" = "smbnix"; + "security" = "user"; #Keep this as user, but guest will be used for access. + "hosts allow" = "192.168.1. 127.0.0.1 localhost"; #Adjust to your LAN. + "hosts deny" = "0.0.0.0/0"; + "guest account" = "nobody"; #Important for guest access. + "map to guest" = "bad user"; #Maps unknown users to guest. + }; + "public" = { + "path" = "/ext/share"; + "browseable" = "yes"; + "read only" = "no"; + "guest ok" = "yes"; #Allows guest access. + "create mask" = "0644"; + "directory mask" = "0755"; + }; + }; + }; + + services.samba-wsdd = { + enable = true; + openFirewall = true; + }; + services.avahi = { + enable = true; + nssmdns = true; + nssmdns4 = true; + openFirewall = true; + reflector = true; + publish = { + domain = true; + enable = true; + userServices = true; + addresses = true; + }; + }; + }; +} diff --git a/modules/hardware/default.nix b/modules/hardware/default.nix new file mode 100644 index 0000000..4181c63 --- /dev/null +++ b/modules/hardware/default.nix @@ -0,0 +1,17 @@ +{lib, ...}: let + # recursively construct attr-set of a directory + getDir = dir: + lib.mapAttrs (file: type: + if type == "directory" + then getDir "${dir}/${file}" + else type) ( + builtins.readDir dir + ); + files = dir: lib.collect lib.isString (lib.mapAttrsRecursive (path: type: lib.concatStringsSep "/" path) (getDir dir)); + validFiles = dir: + map (file: ./. + "/${file}") ( + lib.filter (file: lib.hasSuffix ".nix" file && file != "default.nix") (files dir) + ); +in { + imports = validFiles ./.; +} diff --git a/modules/hardware/laptop.nix b/modules/hardware/laptop.nix new file mode 100644 index 0000000..e467522 --- /dev/null +++ b/modules/hardware/laptop.nix @@ -0,0 +1,33 @@ +{ + config, + lib, + ... +}: let + cfg = config.lily.laptop; +in { + options.lily.laptop.enable = lib.mkEnableOption "activate laptop hardware"; + + config = lib.mkIf cfg.enable { + hardware.bluetooth = { + enable = true; + powerOnBoot = true; + settings = { + General = { + Experimental = true; + Enable = "Source,Sink,Media,Socket"; + }; + }; + }; + powerManagement.enable = true; + + services = { + libinput.enable = true; + }; + systemd.sleep.extraConfig = '' + AllowSuspend=yes + AllowHibernation=yes + AllowHybridSleep=yes + AllowSuspendThenHibernate=yes + ''; + }; +} diff --git a/modules/hardware/nvidia.nix b/modules/hardware/nvidia.nix new file mode 100644 index 0000000..c57a737 --- /dev/null +++ b/modules/hardware/nvidia.nix @@ -0,0 +1,67 @@ +{ + config, + lib, + pkgs, + ... +}: let + cfg = config.lily.nvidia; +in { + options.lily.nvidia.enable = lib.mkEnableOption "activate Nvidia GPU support"; + config = lib.mkIf cfg.enable { + services.xserver.videoDrivers = ["nvidia"]; + environment.systemPackages = with pkgs; [ + libva-utils + nvidia-vaapi-driver + nvtopPackages.nvidia + pciutils + vdpauinfo + cudaPackages.cudatoolkit + cudaPackages.cudnn + cudaPackages.cutensor + ]; + # environment.sessionVariables = lib.mkIf config.lily.wayland.enable { + # GBM_BACKEND = "nvidia-drm"; + # __GLX_VENDOR_LIBRARY_NAME = "nvidia"; + # __GL_GSYNC_ALLOWED = "1"; + # }; + hardware = { + graphics = { + enable = true; + enable32Bit = true; + extraPackages = with pkgs; [ + vaapiVdpau + libvdpau-va-gl + nvidia-vaapi-driver + ocl-icd + ]; + extraPackages32 = with pkgs; [vaapiVdpau]; + }; + nvidia = { + # Modesetting is required. + modesetting.enable = true; + + # Nvidia power management. Experimental, and can cause sleep/suspend to fail. + # Enable this if you have graphical corruption issues or application crashes after waking + # up from sleep. This fixes it by saving the entire VRAM memory to /tmp/ instead + # of just the bare essentials. + powerManagement.enable = true; + + # Fine-grained power management. Turns off GPU when not in use. + # Experimental and only works on modern Nvidia GPUs (Turing or newer). + powerManagement.finegrained = false; + + # Use the NVidia open source kernel module (not to be confused with the + # independent third-party "nouveau" open source driver). + # Support is limited to the Turing and later architectures. Full list of + # supported GPUs is at: + # https://github.com/NVIDIA/open-gpu-kernel-modules#compatible-gpus + # Only available from driver 515.43.04+ + # Currently alpha-quality/buggy, so false is currently the recommended setting. + open = true; + + # Optionally, you may need to select the appropriate driver version for your specific GPU. + package = config.boot.kernelPackages.nvidiaPackages.stable; + }; + }; + }; +} diff --git a/modules/hyprland/default.nix b/modules/hyprland/default.nix new file mode 100644 index 0000000..7538b6b --- /dev/null +++ b/modules/hyprland/default.nix @@ -0,0 +1,141 @@ +{ + config, + lib, + pkgs, + inputs, + ... +}: let + cfg = config.lily.hyprland; +in { + options.lily.hyprland = { + enable = lib.mkEnableOption "activate hyprland"; + }; + config = lib.mkIf cfg.enable { + lily = { + wayland.enable = true; + }; + + services.displayManager.sddm = lib.mkDefault { + enable = true; + wayland.enable = true; + package = pkgs.kdePackages.sddm; + theme = "breeze"; + wayland.compositor = "kwin"; + extraPackages = with pkgs.kdePackages; [ + breeze-icons + kirigami + libplasma + plasma5support + qtsvg + qtvirtualkeyboard + ]; + }; + + programs.hyprland = { + enable = true; + withUWSM = true; + systemd.setPath.enable = true; + }; + programs.waybar.enable = true; + services.blueman.enable = true; + + qt.enable = true; + qt.platformTheme = "kde"; + + environment.systemPackages = with pkgs; [ + # KDE APPLICATIONS + kdePackages.dolphin + kdePackages.systemsettings + + kdePackages.qtwayland + + kdePackages.kwallet # provides helper service + kdePackages.kwallet-pam # provides helper service + kdePackages.kwalletmanager # provides KCMs and stuff + + # FRAMEWORKS AND BASES + kdePackages.plasma-desktop + kdePackages.plasma-workspace + kdePackages.frameworkintegration # For qt plugins + kdePackages.plasma-integration # kde platform theme + kdePackages.sonnet + kdePackages.libplasma + kdePackages.qtsvg + kdePackages.ksvg + kdePackages.knewstuff + kdePackages.kdeplasma-addons + kdePackages.qtsvg + kdePackages.qtdeclarative + kdePackages.kcoreaddons + kdePackages.kguiaddons + kdePackages.kirigami-addons + kdePackages.plasma-integration.qt5 + kdePackages.qtlocation + + # artwork, makes appliations which require org.kde.destkop work + kdePackages.breeze + kdePackages.breeze-icons + kdePackages.breeze-gtk + kdePackages.ocean-sound-theme + kdePackages.plasma-workspace-wallpapers + hicolor-icon-theme # fallback icons + kdePackages.qqc2-breeze-style + kdePackages.qqc2-desktop-style + + kdePackages.breeze.qt5 + kdePackages.plasma-integration.qt5 + plasma5Packages.kwayland-integration + ]; + environment.sessionVariables = { + XDG_CURRENT_DESKTOP = "Hyprland"; + XDG_SESSION_DESKTOP = "Hyprland"; + KPACKAGE_DEP_RESOLVERS_PATH = "${pkgs.kdePackages.frameworkintegration.out}/libexec/kf6/kpackagehandlers"; + }; + services.udisks2.enable = true; + services.upower.enable = true; + services.power-profiles-daemon.enable = true; + # make open menu work + environment.etc."xdg/menus/applications.menu" = { + source = "${pkgs.kdePackages.plasma-workspace}/etc/xdg/menus/plasma-applications.menu"; + }; + # + + programs.ssh.askPassword = lib.mkDefault "${pkgs.kdePackages.ksshaskpass.out}/bin/ksshaskpass"; + programs.gnupg.agent.pinentryPackage = lib.mkForce pkgs.pinentry-qt; + security.pam.services = { + login.kwallet = { + enable = true; + package = lib.mkDefault pkgs.kdePackages.kwallet-pam; + }; + }; + + programs.dconf.enable = true; + + programs.kdeconnect.package = lib.mkForce pkgs.kdePackages.kdeconnect-kde; + systemd = { + user.services.polkit-gnome-authentication-agent-1 = { + description = "polkit-gnome-authentication-agent-1"; + wantedBy = ["graphical-session.target"]; + wants = ["graphical-session.target"]; + after = ["graphical-session.target"]; + serviceConfig = { + Type = "simple"; + ExecStart = "${pkgs.polkit_gnome}/libexec/polkit-gnome-authentication-agent-1"; + Restart = "on-failure"; + RestartSec = 1; + TimeoutStopSec = 10; + }; + }; + user.services.powerdevil = { + description = "powerdevil"; + wantedBy = ["graphical-session.target"]; + wants = ["graphical-session.target"]; + after = ["graphical-session.target"]; + serviceConfig = { + Type = "simple"; + ExecStart = "${pkgs.kdePackages.powerdevil}/libexec/org_kde_powerdevil"; + }; + }; + }; + }; +} diff --git a/modules/plasma/default.nix b/modules/plasma/default.nix new file mode 100644 index 0000000..463113f --- /dev/null +++ b/modules/plasma/default.nix @@ -0,0 +1,18 @@ +{ + lib, + config, + ... +}: let + cfg = config.lily.plasma; +in { + options.lily.plasma.enable = lib.mkEnableOption "activate plasma"; + config = lib.mkIf cfg.enable { + services = { + displayManager.sddm = { + enable = true; + wayland.enable = true; + }; + desktopManager.plasma6.enable = true; + }; + }; +} diff --git a/modules/runners/default.nix b/modules/runners/default.nix new file mode 100644 index 0000000..da876fe --- /dev/null +++ b/modules/runners/default.nix @@ -0,0 +1,32 @@ +{ + lib, + config, + pkgs, + ... +}: let + cfg = config.lily.runners; +in { + options.lily.runners.enable = lib.mkEnableOption "activate plasma"; + config = lib.mkIf cfg.enable { + # Example + # age.secrets.lily.file = ./secrets/lily.age; + # services.gitea-actions-runner = { + # package = pkgs.forgejo-runner; + # instances = { + # lilyvex = { + # enable = true; + # name = "caz-runner"; + # # token = runner-key; + # tokenFile = config.age.secrets.lily.path; + # url = "https://git.lilyvex.dev/"; + # labels = [ + # "node-22:docker://node:22-bookworm" + # "nixos-latest:docker://nixos/nix" + # "ubuntu-latest:docker://node:16-bullseye" + # ]; + # #settings = { ... }; + # }; + # }; + # }; + }; +} diff --git a/modules/runners/secrets/lily.age b/modules/runners/secrets/lily.age new file mode 100644 index 0000000..99a1a64 --- /dev/null +++ b/modules/runners/secrets/lily.age @@ -0,0 +1,7 @@ +age-encryption.org/v1 +-> ssh-ed25519 gwCq6Q YfhZEEqe8nFJInm13FuPk3lAS5MpTHeTbPYE2czQJmk +YApzb5JSzg+hGULtJGOzH04XWuzjTtf4jB9rPnweBzU +-> ssh-ed25519 TvHG8g o8lSKhyOUvW8lz303Z6b5/TasTiN4ENcS0Bg1ZAugFA +e5tvFv819718uInabUIRJYOC45f/MYQkI4jep+DA+6o +--- Hw3Q1yUIXUmajkeK0sBRjLQcR4GjFh97hTu9jTIopIM +.��-�ԓN1�3$�0�\ ��2�p���|/�y��7S�X5bLdI�t��������r �F�2`�X�s�����#� \ No newline at end of file diff --git a/modules/runners/secrets/potato.age b/modules/runners/secrets/potato.age new file mode 100644 index 0000000000000000000000000000000000000000..31c066ed90b632c9f963394ed00fdcc1bca5f78a GIT binary patch literal 369 zcmYdHPt{G$OD?J`D9Oyv)5|YP*Do{V(zR14F3!+RO))YxHMCSnFLy393si6}wFq*~ z%&*KT&ayCf^ht~`54VW$4l2?P2{tzl4v0!EFY+)C(+~2_v*4;KFp3N;&#EZP_i!&M z4-U=NH*+yWAi($k@O!%p|JP z(#ONeD=E!iJHREwC&a=f)hWWiz&Fv*IH$Zk+?6XkFEHCTztSMhz$+uypvXP7!XnHi z*wwKp%)B78AR;v}yRNVj04s>=MZK(1D^GSwsY@dpJMZg1(DyCbT9No3v?vF}rv>s@|5FrIp6 z_WbL23*%F^H1P;tDOtZ{ja8KH9476A*MDseZgfyj^>F{hZ&ott&P?xy=fBlfssR8@ C$b$g@ literal 0 HcmV?d00001 diff --git a/modules/runners/secrets/secrets.nix b/modules/runners/secrets/secrets.nix new file mode 100644 index 0000000..5bd7b7f --- /dev/null +++ b/modules/runners/secrets/secrets.nix @@ -0,0 +1,19 @@ +let + lily = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIHj4f4GlA+DP491i9ssmm+Ys/TLikz6ALk1kkglhcywY lily@GreenMachine"; + users = [lily]; + system = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAID/rgN3hR4K2Mu/Oy3tgaGfDfCss3CrNJn2jTTQJQKKn root@nixos"; + systems = [system]; +in { + # age.secrets.potato.file = ./potato.age; + # age.secrets.lily.file = ./lily.age; + "potato.age".publicKeys = [ + lily + + system + ]; + "lily.age".publicKeys = [ + lily + + system + ]; +} diff --git a/modules/users/default.nix b/modules/users/default.nix new file mode 100644 index 0000000..4181c63 --- /dev/null +++ b/modules/users/default.nix @@ -0,0 +1,17 @@ +{lib, ...}: let + # recursively construct attr-set of a directory + getDir = dir: + lib.mapAttrs (file: type: + if type == "directory" + then getDir "${dir}/${file}" + else type) ( + builtins.readDir dir + ); + files = dir: lib.collect lib.isString (lib.mapAttrsRecursive (path: type: lib.concatStringsSep "/" path) (getDir dir)); + validFiles = dir: + map (file: ./. + "/${file}") ( + lib.filter (file: lib.hasSuffix ".nix" file && file != "default.nix") (files dir) + ); +in { + imports = validFiles ./.; +} diff --git a/modules/users/lily.nix b/modules/users/lily.nix new file mode 100644 index 0000000..986e761 --- /dev/null +++ b/modules/users/lily.nix @@ -0,0 +1,21 @@ +{ + lib, + config, + pkgs, + ... +}: let + cfg = config.lily.users.lily; + # interpolated_secrets = import ../../secrets/interpolated_secrets.nix; +in { + options.lily.users.lily.enable = lib.mkEnableOption "activate user lily"; + config = lib.mkIf cfg.enable { + users.users.lily = { + home = "/home/lily"; + isNormalUser = true; + # hashedPasswordFile = lib.mkIf config.lily.sops config.sops.secrets."users/lily/hashedPassword".path; + extraGroups = ["wheel" "openrazer" "docker"] ++ lib.optionals config.networking.networkmanager.enable ["networkmanager"]; + shell = pkgs.zsh; + }; + # sops.secrets."users/lily/hashedPassword" = lib.mkIf config.lily.sops { neededForUsers = true; }; + }; +} diff --git a/modules/wayland/default.nix b/modules/wayland/default.nix new file mode 100644 index 0000000..c896cc9 --- /dev/null +++ b/modules/wayland/default.nix @@ -0,0 +1,37 @@ +{ + lib, + pkgs, + config, + ... +}: let + cfg = config.lily.wayland; +in { + options.lily.wayland.enable = lib.mkEnableOption "activate wayland"; + config = lib.mkIf cfg.enable { + programs.xwayland.enable = true; + environment.systemPackages = with pkgs; + [ + wl-clipboard + xwayland + xwaylandvideobridge + wayland-utils + wev + ] + ++ lib.optionals (config.lily.plasma.enable) [kdePackages.plasma-wayland-protocols]; + environment.sessionVariables = { + NIXOS_OZONE_WL = "1"; + MOZ_ENABLE_WAYLAND = "1"; + QT_QUICK_CONTROLS_STYLE = "org.kde.desktop"; + SDL_VIDEODRIVER = "wayland"; + CLUTTER_BACKEND = "wayland"; + QT_QPA_PLATFORM = "wayland;xcb"; + XDG_SESSION_TYPE = "wayland"; + GDK_BACKEND = "wayland,x11"; + }; + services.dbus.enable = true; + security = { + polkit.enable = true; + rtkit.enable = true; + }; + }; +} diff --git a/nixos/configuration.nix b/nixos/configuration.nix deleted file mode 100644 index 0984d3f..0000000 --- a/nixos/configuration.nix +++ /dev/null @@ -1,28 +0,0 @@ -{ config, lib, pkgs, self, ... }: - -{ - imports = - [ # Include the results of the hardware scan. - ./hardware/hardware.nix - ./environments/plasma-wayland.nix - # ./environments/gnome.nix - ./users/luxzi.nix - ./services/services.nix - ./programs/programs.nix - ./misc/misc.nix - ]; - - nixpkgs.config.allowUnfree = true; - - # Copy the NixOS configuration file and link it from the resulting system - # (/run/current-system/configuration.nix). This is useful in case you - # accidentally delete configuration.nix. - # system.copySystemConfiguration = true; - - # This value does NOT affect the Nixpkgs version your packages and OS are pulled from, - # so changing it will NOT upgrade your system - see https://nixos.org/manual/nixos/stable/#sec-upgrading for how - # to actually do that. - # For more information, see `man configuration.nix` or https://nixos.org/manual/nixos/stable/options#opt-system.stateVersion . - system.stateVersion = "24.05"; # Did you read the comment? -} - diff --git a/nixos/environments/gnome.nix b/nixos/environments/gnome.nix deleted file mode 100644 index ce7d35f..0000000 --- a/nixos/environments/gnome.nix +++ /dev/null @@ -1,9 +0,0 @@ -{ ... }: - -{ - services.xserver.enable = true; - services.xserver.videoDrivers = ["nvidia"]; - services.xserver.displayManager.gdm.enable = true; - services.xserver.displayManager.gdm.wayland = true; - services.xserver.desktopManager.gnome.enable = true; -} diff --git a/nixos/environments/plasma-wayland.nix b/nixos/environments/plasma-wayland.nix deleted file mode 100644 index fb77cf1..0000000 --- a/nixos/environments/plasma-wayland.nix +++ /dev/null @@ -1,14 +0,0 @@ -{ pkgs, ... }: - -{ - services.xserver.videoDrivers = ["nvidia"]; - - services.displayManager.sddm.enable = true; - services.displayManager.sddm.wayland.enable = true; - services.desktopManager.plasma6.enable = true; - - environment.plasma6.excludePackages = with pkgs; [ - plasma-browser-integration - konsole - ]; -} diff --git a/nixos/hardware/fstab.nix b/nixos/hardware/fstab.nix deleted file mode 100644 index b8cbc26..0000000 --- a/nixos/hardware/fstab.nix +++ /dev/null @@ -1,14 +0,0 @@ -{ ... }: - -{ - fileSystems."/" = - { device = "/dev/disk/by-uuid/afce32c1-67df-4324-aebb-a113b71317b9"; - fsType = "ext4"; - }; - - fileSystems."/boot" = - { device = "/dev/disk/by-uuid/12CE-A600"; - fsType = "vfat"; - options = [ "fmask=0022" "dmask=0022" ]; - }; -} diff --git a/nixos/hardware/hardware.nix b/nixos/hardware/hardware.nix deleted file mode 100644 index c7cd0a6..0000000 --- a/nixos/hardware/hardware.nix +++ /dev/null @@ -1,13 +0,0 @@ -{ ... }: - -{ - imports = - [ - ./modules.nix - ./fstab.nix - ./audio.nix - ./network.nix - ./intel.nix - ./nvidia.nix - ]; -} diff --git a/nixos/hardware/intel.nix b/nixos/hardware/intel.nix deleted file mode 100644 index 88bf59e..0000000 --- a/nixos/hardware/intel.nix +++ /dev/null @@ -1,6 +0,0 @@ -{ lib, config, ... }: - -{ - nixpkgs.hostPlatform = lib.mkDefault "x86_64-linux"; - hardware.cpu.intel.updateMicrocode = lib.mkDefault config.hardware.enableRedistributableFirmware; -} diff --git a/nixos/hardware/modules.nix b/nixos/hardware/modules.nix deleted file mode 100644 index 1593b53..0000000 --- a/nixos/hardware/modules.nix +++ /dev/null @@ -1,13 +0,0 @@ -{ modulesPath, ... }: - -{ - imports = - [ - (modulesPath + "/installer/scan/not-detected.nix") - ]; - - boot.initrd.availableKernelModules = [ "xhci_pci" "ahci" "nvme" "usbhid" "usb_storage" "sd_mod" ]; - boot.initrd.kernelModules = [ ]; - boot.kernelModules = [ "kvm-intel" ]; - boot.extraModulePackages = [ ]; -} diff --git a/nixos/hardware/network.nix b/nixos/hardware/network.nix deleted file mode 100644 index 45bc069..0000000 --- a/nixos/hardware/network.nix +++ /dev/null @@ -1,5 +0,0 @@ -{ lib, ... }: - -{ - networking.useDHCP = lib.mkDefault true; -} diff --git a/nixos/hardware/nvidia.nix b/nixos/hardware/nvidia.nix deleted file mode 100644 index eb1abd6..0000000 --- a/nixos/hardware/nvidia.nix +++ /dev/null @@ -1,13 +0,0 @@ -{ config, ... }: - -{ - hardware.graphics.enable = true; - hardware.nvidia = { - modesetting.enable = true; - powerManagement.enable = false; - powerManagement.finegrained = false; - open = false; - nvidiaSettings = false; - package = config.boot.kernelPackages.nvidiaPackages.stable; - }; -} diff --git a/nixos/misc/locale.nix b/nixos/misc/locale.nix deleted file mode 100644 index 01de88c..0000000 --- a/nixos/misc/locale.nix +++ /dev/null @@ -1,5 +0,0 @@ -{ ... }: - -{ - i18n.defaultLocale = "en_US.UTF-8"; -} diff --git a/nixos/misc/misc.nix b/nixos/misc/misc.nix deleted file mode 100644 index 0ff1eca..0000000 --- a/nixos/misc/misc.nix +++ /dev/null @@ -1,10 +0,0 @@ -{ ... }: - -{ - imports = - [ - ./time.nix - ./locale.nix - ./nixconfig.nix - ]; -} diff --git a/nixos/misc/nixconfig.nix b/nixos/misc/nixconfig.nix deleted file mode 100644 index 88d2b4a..0000000 --- a/nixos/misc/nixconfig.nix +++ /dev/null @@ -1,6 +0,0 @@ -{ ... }: - -{ - nix.settings.experimental-features = [ "nix-command" "flakes" ]; - nixpkgs.config.allowUnfree = true; -} diff --git a/nixos/misc/time.nix b/nixos/misc/time.nix deleted file mode 100644 index edf3feb..0000000 --- a/nixos/misc/time.nix +++ /dev/null @@ -1,5 +0,0 @@ -{ ... }: - -{ - time.timeZone = "America/New_York"; -} diff --git a/nixos/programs/dconf.nix b/nixos/programs/dconf.nix deleted file mode 100644 index 11c2c3b..0000000 --- a/nixos/programs/dconf.nix +++ /dev/null @@ -1,5 +0,0 @@ -{ ... }: - -{ - programs.dconf.enable = true; -} diff --git a/nixos/programs/gpg.nix b/nixos/programs/gpg.nix deleted file mode 100644 index 0ade0fc..0000000 --- a/nixos/programs/gpg.nix +++ /dev/null @@ -1,8 +0,0 @@ -{ ... }: - -{ - programs.gnupg.agent = { - enable = true; - enableSSHSupport = true; - }; -} diff --git a/nixos/programs/nix-ld.nix b/nixos/programs/nix-ld.nix deleted file mode 100644 index d178e51..0000000 --- a/nixos/programs/nix-ld.nix +++ /dev/null @@ -1,8 +0,0 @@ -{ pkgs, ... }: - -{ - programs.nix-ld = { - enable = true; - libraries = with pkgs; []; - }; -} diff --git a/nixos/programs/programs.nix b/nixos/programs/programs.nix deleted file mode 100644 index 6b2b27c..0000000 --- a/nixos/programs/programs.nix +++ /dev/null @@ -1,36 +0,0 @@ -{ pkgs, ... }: - -{ - imports = - [ - ./nix-ld.nix - ./dconf.nix - ./gpg.nix - ./steam.nix - ]; - - environment.systemPackages = with pkgs; [ - wget - curl - git - neovim - nerd-fonts.fira-code - cmake - ninja - libgcc - gnumake - topgrade - unzip - patchelf - wl-clipboard - jdk17 - jre8 - python3 - clang-tools - clang - libtool - libvterm - pkg-config - openssl - ]; -} diff --git a/nixos/programs/steam.nix b/nixos/programs/steam.nix deleted file mode 100644 index 3e50e04..0000000 --- a/nixos/programs/steam.nix +++ /dev/null @@ -1,5 +0,0 @@ -{ ... }: - -{ - programs.steam.enable = true; -} diff --git a/nixos/services/audio.nix b/nixos/services/audio.nix deleted file mode 100644 index 268a81c..0000000 --- a/nixos/services/audio.nix +++ /dev/null @@ -1,5 +0,0 @@ -{ ... }: - -{ - services.pulseaudio.enable = false; -} diff --git a/nixos/services/boot.nix b/nixos/services/boot.nix deleted file mode 100644 index 8e3bb56..0000000 --- a/nixos/services/boot.nix +++ /dev/null @@ -1,9 +0,0 @@ -{ ... }: - -{ - boot.loader.systemd-boot.enable = true; - boot.loader.systemd-boot.configurationLimit = 10; - boot.loader.systemd-boot.editor = false; - boot.loader.efi.efiSysMountPoint = "/boot"; - boot.loader.efi.canTouchEfiVariables = true; -} diff --git a/nixos/services/cups.nix b/nixos/services/cups.nix deleted file mode 100644 index 4610bde..0000000 --- a/nixos/services/cups.nix +++ /dev/null @@ -1,5 +0,0 @@ -{ ... }: - -{ - services.printing.enable = true; -} diff --git a/nixos/services/firewall.nix b/nixos/services/firewall.nix deleted file mode 100644 index 54168e7..0000000 --- a/nixos/services/firewall.nix +++ /dev/null @@ -1,7 +0,0 @@ -{ ... }: - -{ - networking.firewall.enable = false; - networking.firewall.allowedTCPPorts = []; - networking.firewall.allowedUDPPorts = []; -} diff --git a/nixos/services/libinput.nix b/nixos/services/libinput.nix deleted file mode 100644 index 4640b6d..0000000 --- a/nixos/services/libinput.nix +++ /dev/null @@ -1,5 +0,0 @@ -{ ... }: - -{ - services.libinput.enable = true; -} diff --git a/nixos/services/networkmanager.nix b/nixos/services/networkmanager.nix deleted file mode 100644 index 55ce0e4..0000000 --- a/nixos/services/networkmanager.nix +++ /dev/null @@ -1,6 +0,0 @@ -{ ... }: - -{ - networking.hostName = "nixos"; - networking.networkmanager.enable = true; -} diff --git a/nixos/services/pipewire.nix b/nixos/services/pipewire.nix deleted file mode 100644 index dcba83f..0000000 --- a/nixos/services/pipewire.nix +++ /dev/null @@ -1,11 +0,0 @@ -{ ... }: - -{ - services.pipewire = { - enable = true; - audio.enable = true; - pulse.enable = true; - alsa.enable = true; - alsa.support32Bit = true; - }; -} diff --git a/nixos/services/services.nix b/nixos/services/services.nix deleted file mode 100644 index 406d113..0000000 --- a/nixos/services/services.nix +++ /dev/null @@ -1,15 +0,0 @@ -{ ... }: - -{ - imports = - [ - ./boot.nix - ./pipewire.nix - ./cups.nix - ./firewall.nix - ./libinput.nix - ./networkmanager.nix - ]; - - services.flatpak.enable = true; -} diff --git a/nixos/users/luxzi.nix b/nixos/users/luxzi.nix deleted file mode 100644 index 587a5d3..0000000 --- a/nixos/users/luxzi.nix +++ /dev/null @@ -1,15 +0,0 @@ -{ self, pkgs, ... }: - -{ - users.users.luxzi = { - isNormalUser = true; - extraGroups = [ "wheel" ]; # Enable ‘sudo’ for the user. - shell = pkgs.zsh; - packages = [ - self.inputs.home-manager.packages.${pkgs.system}.home-manager - ]; - }; - - environment.shells = with pkgs; [ zsh ]; - programs.zsh.enable = true; -} diff --git a/overlays/default.nix b/overlays/default.nix new file mode 100644 index 0000000..3876dad --- /dev/null +++ b/overlays/default.nix @@ -0,0 +1,37 @@ +{inputs, ...}: { + # This one brings our custom packages from the 'pkgs' directory + additions = final: _prev: import ../pkgs final.pkgs; + + # This one contains whatever you want to overlay + # You can change versions, add patches, set compilation flags, anything really. + # https://nixos.wiki/wiki/Overlays + modifications = final: prev: { + prismlauncher = prev.prismlauncher.overrideAttrs (oldAttrs: { + buildInputs = (oldAttrs.buildInputs or []) ++ [final.jdk23]; + jdks = [ + final.jdk23 + ]; + # configurePhase = '' + # export JAVA_HOME=${pkgs.jdk22} + # ''; + # installPhase = '' + # mkdir -p $out/bin + # cp -r $oldAttrs.out/* $out/ + # # Create a wrapper script to ensure JAVA_HOME is set + # echo '#!/bin/sh' > $out/bin/prismlauncher + # echo "export JAVA_HOME=${pkgs.jdk22}" >> $out/bin/prismlauncher + # echo "exec $out/bin/PrismLauncher \"\$@\"" >> $out/bin/prismlauncher + # chmod +x $out/bin/prismlauncher + # ''; + }); + }; + + # When applied, the unstable nixpkgs set (declared in the flake inputs) will + # be accessible through 'pkgs.unstable' + unstable-packages = final: _prev: { + unstable = import inputs.nixpkgs-unstable { + system = final.system; + config.allowUnfree = true; + }; + }; +} diff --git a/pkgs/default.nix b/pkgs/default.nix new file mode 100644 index 0000000..3d9e23c --- /dev/null +++ b/pkgs/default.nix @@ -0,0 +1,5 @@ +# Custom packages, that can be defined similarly to ones from nixpkgs +# You can build them using 'nix build .#example' +pkgs: { + # example = pkgs.callPackage ./example { }; +} From 6a3dd58475e88c951e21d7f1bd928e0be06e7200 Mon Sep 17 00:00:00 2001 From: lily Date: Sat, 29 Mar 2025 21:06:33 -0400 Subject: [PATCH 044/102] rm: overlays --- overlays/default.nix | 37 ------------------------------------- 1 file changed, 37 deletions(-) delete mode 100644 overlays/default.nix diff --git a/overlays/default.nix b/overlays/default.nix deleted file mode 100644 index 3876dad..0000000 --- a/overlays/default.nix +++ /dev/null @@ -1,37 +0,0 @@ -{inputs, ...}: { - # This one brings our custom packages from the 'pkgs' directory - additions = final: _prev: import ../pkgs final.pkgs; - - # This one contains whatever you want to overlay - # You can change versions, add patches, set compilation flags, anything really. - # https://nixos.wiki/wiki/Overlays - modifications = final: prev: { - prismlauncher = prev.prismlauncher.overrideAttrs (oldAttrs: { - buildInputs = (oldAttrs.buildInputs or []) ++ [final.jdk23]; - jdks = [ - final.jdk23 - ]; - # configurePhase = '' - # export JAVA_HOME=${pkgs.jdk22} - # ''; - # installPhase = '' - # mkdir -p $out/bin - # cp -r $oldAttrs.out/* $out/ - # # Create a wrapper script to ensure JAVA_HOME is set - # echo '#!/bin/sh' > $out/bin/prismlauncher - # echo "export JAVA_HOME=${pkgs.jdk22}" >> $out/bin/prismlauncher - # echo "exec $out/bin/PrismLauncher \"\$@\"" >> $out/bin/prismlauncher - # chmod +x $out/bin/prismlauncher - # ''; - }); - }; - - # When applied, the unstable nixpkgs set (declared in the flake inputs) will - # be accessible through 'pkgs.unstable' - unstable-packages = final: _prev: { - unstable = import inputs.nixpkgs-unstable { - system = final.system; - config.allowUnfree = true; - }; - }; -} From dafd7d86da1035b199232939aceed6a9405408d1 Mon Sep 17 00:00:00 2001 From: lily Date: Sat, 29 Mar 2025 21:56:46 -0400 Subject: [PATCH 045/102] update: misc --- flake.lock | 23 ++- flake.nix | 5 +- home-manager/modules/chromium/default.nix | 27 ---- home-manager/modules/ghostty/default.nix | 37 ----- home-manager/modules/ghostty/shaders/crt.glsl | 153 ------------------ .../modules/ghostty/shaders/glow.glsl | 145 ----------------- home-manager/modules/git/default.nix | 6 +- home-manager/modules/kitty/default.nix | 22 +++ home-manager/modules/zed/default.nix | 103 ------------ home-manager/nix/home.nix | 7 +- home-manager/profiles/desktop.nix | 5 +- machines/nix/configuration.nix | 5 +- machines/nix/hardware-configuration.nix | 48 +++--- modules/hardware/nvidia.nix | 2 +- 14 files changed, 75 insertions(+), 513 deletions(-) delete mode 100644 home-manager/modules/chromium/default.nix delete mode 100644 home-manager/modules/ghostty/default.nix delete mode 100644 home-manager/modules/ghostty/shaders/crt.glsl delete mode 100644 home-manager/modules/ghostty/shaders/glow.glsl create mode 100644 home-manager/modules/kitty/default.nix delete mode 100644 home-manager/modules/zed/default.nix diff --git a/flake.lock b/flake.lock index f732535..d527f10 100644 --- a/flake.lock +++ b/flake.lock @@ -320,7 +320,8 @@ "nix-gaming": "nix-gaming", "nixpkgs": "nixpkgs_3", "nixpkgs-unstable": "nixpkgs-unstable", - "nixvim": "nixvim" + "nixvim": "nixvim", + "zen-browser": "zen-browser" } }, "systems": { @@ -352,6 +353,26 @@ "repo": "default", "type": "github" } + }, + "zen-browser": { + "inputs": { + "nixpkgs": [ + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1743216975, + "narHash": "sha256-29xgm8F3DCcTNrQZ9V3Pwj6BkjalkKvGyjd+sF9/+3k=", + "owner": "0xc000022070", + "repo": "zen-browser-flake", + "rev": "165ee672e6b17a8bcc0a3fb51fab3f79715cc1f3", + "type": "github" + }, + "original": { + "owner": "0xc000022070", + "repo": "zen-browser-flake", + "type": "github" + } } }, "root": "root", diff --git a/flake.nix b/flake.nix index ed0a138..90c4770 100644 --- a/flake.nix +++ b/flake.nix @@ -15,6 +15,8 @@ nixvim.url = "github:nix-community/nixvim"; nixvim.inputs.nixpkgs.follows = "nixpkgs"; nix-gaming.url = "github:fufexan/nix-gaming"; + zen-browser.url = "github:0xc000022070/zen-browser-flake"; + zen-browser.inputs.nixpkgs.follows = "nixpkgs"; }; outputs = { @@ -45,9 +47,6 @@ # Other options beside 'alejandra' include 'nixpkgs-fmt' formatter = forAllSystems (system: nixpkgs.legacyPackages.${system}.alejandra); - # Your custom packages and modifications, exported as overlays - overlays = import ./overlays {inherit inputs;}; - nixosModules = builtins.listToAttrs ( (map (x: { name = x; diff --git a/home-manager/modules/chromium/default.nix b/home-manager/modules/chromium/default.nix deleted file mode 100644 index 4bc2a70..0000000 --- a/home-manager/modules/chromium/default.nix +++ /dev/null @@ -1,27 +0,0 @@ -{ - config, - lib, - ... -}: let - cfg = config.lily.chromium; -in { - options.lily.chromium = { - enable = lib.mkEnableOption "activate chromium"; - }; - config = lib.mkIf cfg.enable { - programs.chromium = { - enable = true; - extensions = [ - {id = "cjpalhdlnbpafiamejdnhcphjbkeiagm";} # ublock origin - {id = "pkehgijcmpdhfbdbbnkijodmdjhbjlgp";} # privacy badger - {id = "ldpochfccmkkmhdbclfhpagapcfdljkj";} # decentraleyes - {id = "mnjggcdmjocbbbhaepdhchncahnbgone";} # sponsor block - {id = "gebbhagfogifgggkldgodflihgfeippi";} # return youtube dislike (just cuz) - ]; - commandLineArgs = [ - "--enable-features=UseOzonePlatform" - "--ozone-platform=wayland" - ]; - }; - }; -} diff --git a/home-manager/modules/ghostty/default.nix b/home-manager/modules/ghostty/default.nix deleted file mode 100644 index 5226865..0000000 --- a/home-manager/modules/ghostty/default.nix +++ /dev/null @@ -1,37 +0,0 @@ -{ - config, - lib, - ... -}: let - cfg = config.lily.ghostty; -in { - options.lily.ghostty = { - enable = lib.mkEnableOption "activate ghostty"; - }; - - config = lib.mkIf cfg.enable { - home.file.".config/ghostty/shaders" = { - source = ./shaders; - recursive = true; - }; - programs.ghostty = { - enable = true; - - settings = { - background-blur-radius = 0; - #theme = "dark:catppuccin-mocha,light:catppuccin-latte"; - window-theme = "dark"; - background-opacity = 0.75; - minimum-contrast = 1.1; - window-padding-x = 5; - window-padding-y = 5; - gtk-adwaita = false; - gtk-titlebar = false; - # custom-shader = "shaders/crt.glsl"; - # custom-shader = "shaders/glow.glsl"; - confirm-close-surface = false; - custom-shader-animation = true; - }; - }; - }; -} diff --git a/home-manager/modules/ghostty/shaders/crt.glsl b/home-manager/modules/ghostty/shaders/crt.glsl deleted file mode 100644 index ecce90d..0000000 --- a/home-manager/modules/ghostty/shaders/crt.glsl +++ /dev/null @@ -1,153 +0,0 @@ -// First it does a "chromatic aberration" by splitting the rgb signals by a product of sin functions -// over time, then it does a glow effect in a perceptual color space -// Based on kalgynirae's Ghostty passable glow shader and NickWest's Chromatic Aberration shader demo -// Passable glow: https://github.com/kalgynirae/dotfiles/blob/main/ghostty/glow.glsl -// "Chromatic Aberration": https://www.shadertoy.com/view/Mds3zn - -// sRGB linear -> nonlinear transform from https://bottosson.github.io/posts/colorwrong/ -float f(float x) { - if (x >= 0.0031308) { - return 1.055 * pow(x, 1.0 / 2.4) - 0.055; - } else { - return 12.92 * x; - } -} - -float f_inv(float x) { - if (x >= 0.04045) { - return pow((x + 0.055) / 1.055, 2.4); - } else { - return x / 12.92; - } -} - -// Oklab <-> linear sRGB conversions from https://bottosson.github.io/posts/oklab/ -vec4 toOklab(vec4 rgb) { - vec3 c = vec3(f_inv(rgb.r), f_inv(rgb.g), f_inv(rgb.b)); - float l = 0.4122214708 * c.r + 0.5363325363 * c.g + 0.0514459929 * c.b; - float m = 0.2119034982 * c.r + 0.6806995451 * c.g + 0.1073969566 * c.b; - float s = 0.0883024619 * c.r + 0.2817188376 * c.g + 0.6299787005 * c.b; - float l_ = pow(l, 1.0 / 3.0); - float m_ = pow(m, 1.0 / 3.0); - float s_ = pow(s, 1.0 / 3.0); - return vec4( - 0.2104542553 * l_ + 0.7936177850 * m_ - 0.0040720468 * s_, - 1.9779984951 * l_ - 2.4285922050 * m_ + 0.4505937099 * s_, - 0.0259040371 * l_ + 0.7827717662 * m_ - 0.8086757660 * s_, - rgb.a - ); -} - -vec4 toRgb(vec4 oklab) { - vec3 c = oklab.rgb; - float l_ = c.r + 0.3963377774 * c.g + 0.2158037573 * c.b; - float m_ = c.r - 0.1055613458 * c.g - 0.0638541728 * c.b; - float s_ = c.r - 0.0894841775 * c.g - 1.2914855480 * c.b; - float l = l_ * l_ * l_; - float m = m_ * m_ * m_; - float s = s_ * s_ * s_; - vec3 linear_srgb = vec3( - 4.0767416621 * l - 3.3077115913 * m + 0.2309699292 * s, - -1.2684380046 * l + 2.6097574011 * m - 0.3413193965 * s, - -0.0041960863 * l - 0.7034186147 * m + 1.7076147010 * s - ); - return vec4( - clamp(f(linear_srgb.r), 0.0, 1.0), - clamp(f(linear_srgb.g), 0.0, 1.0), - clamp(f(linear_srgb.b), 0.0, 1.0), - oklab.a - ); -} - -// Bloom samples from https://gist.github.com/qwerasd205/c3da6c610c8ffe17d6d2d3cc7068f17f -const vec3[24] samples = { - vec3(0.1693761725038636, 0.9855514761735895, 1), - vec3(-1.333070830962943, 0.4721463328627773, 0.7071067811865475), - vec3(-0.8464394909806497, -1.51113870578065, 0.5773502691896258), - vec3(1.554155680728463, -1.2588090085709776, 0.5), - vec3(1.681364377589461, 1.4741145918052656, 0.4472135954999579), - vec3(-1.2795157692199817, 2.088741103228784, 0.4082482904638631), - vec3(-2.4575847530631187, -0.9799373355024756, 0.3779644730092272), - vec3(0.5874641440200847, -2.7667464429345077, 0.35355339059327373), - vec3(2.997715703369726, 0.11704939884745152, 0.3333333333333333), - vec3(0.41360842451688395, 3.1351121305574803, 0.31622776601683794), - vec3(-3.167149933769243, 0.9844599011770256, 0.30151134457776363), - vec3(-1.5736713846521535, -3.0860263079123245, 0.2886751345948129), - vec3(2.888202648340422, -2.1583061557896213, 0.2773500981126146), - vec3(2.7150778983300325, 2.5745586041105715, 0.2672612419124244), - vec3(-2.1504069972377464, 3.2211410627650165, 0.2581988897471611), - vec3(-3.6548858794907493, -1.6253643308191343, 0.25), - vec3(1.0130775986052671, -3.9967078676335834, 0.24253562503633297), - vec3(4.229723673607257, 0.33081361055181563, 0.23570226039551587), - vec3(0.40107790291173834, 4.340407413572593, 0.22941573387056174), - vec3(-4.319124570236028, 1.159811599693438, 0.22360679774997896), - vec3(-1.9209044802827355, -4.160543952132907, 0.2182178902359924), - vec3(3.8639122286635708, -2.6589814382925123, 0.21320071635561041), - vec3(3.3486228404946234, 3.4331800232609, 0.20851441405707477), - vec3(-2.8769733643574344, 3.9652268864187157, 0.20412414523193154) -}; - -float offsetFunction(float iTime) { - float amount = 1.0; - const float periods[4] = {6.0, 16.0, 19.0, 27.0}; - for (int i = 0; i < 4; i++) { - amount *= 1.0 + 0.5 * sin(iTime*periods[i]); - } - //return amount; - return amount * periods[3]; -} - -const float DIM_CUTOFF = 0.35; -const float BRIGHT_CUTOFF = 0.65; -const float ABBERATION_FACTOR = 0.05; - -void mainImage(out vec4 fragColor, in vec2 fragCoord) { - vec2 uv = fragCoord.xy / iResolution.xy; - - // Sample the original color - vec4 originalColor = texture(iChannel0, uv); - - // Check if the pixel is part of the text (assuming alpha > 0.0) - if (originalColor.a > 0.0) { - float amount = offsetFunction(iTime); - - vec3 col; - col.r = texture( iChannel0, vec2(uv.x-ABBERATION_FACTOR*amount / iResolution.x, uv.y) ).r; - col.g = texture( iChannel0, uv ).g; - col.b = texture( iChannel0, vec2(uv.x+ABBERATION_FACTOR*amount / iResolution.x, uv.y) ).b; - - vec4 splittedColor = vec4(col, originalColor.a); // Keep the original alpha - vec4 source = toOklab(splittedColor); - vec4 dest = source; - - if (source.x > DIM_CUTOFF) { - dest.x *= 1.2; - // dest.x = 1.2; - } else { - vec2 step = vec2(1.414) / iResolution.xy; - vec3 glow = vec3(0.0); - for (int i = 0; i < 24; i++) { - vec3 s = samples[i]; - float weight = s.z; - vec4 c = toOklab(texture(iChannel0, uv + s.xy * step)); - if (c.x > DIM_CUTOFF) { - glow.yz += c.yz * weight * 0.3; - if (c.x <= BRIGHT_CUTOFF) { - glow.x += c.x * weight * 0.05; - } else { - glow.x += c.x * weight * 0.10; - } - } - } - // float lightness_diff = clamp(glow.x - dest.x, 0.0, 1.0); - // dest.x = lightness_diff; - // dest.yz = dest.yz * (1.0 - lightness_diff) + glow.yz * lightness_diff; - dest.xyz += glow.xyz; - } - - fragColor = toRgb(dest); - } else { - // If the pixel is background, set alpha to 0.0 for transparency - fragColor = vec4(originalColor.rgb, 0.0); - } -} diff --git a/home-manager/modules/ghostty/shaders/glow.glsl b/home-manager/modules/ghostty/shaders/glow.glsl deleted file mode 100644 index 83bef9c..0000000 --- a/home-manager/modules/ghostty/shaders/glow.glsl +++ /dev/null @@ -1,145 +0,0 @@ -// First it does a "chromatic aberration" by splitting the rgb signals by a product of sin functions -// over time, then it does a glow effect in a perceptual color space -// Based on kalgynirae's Ghostty passable glow shader and NickWest's Chromatic Aberration shader demo -// Passable glow: https://github.com/kalgynirae/dotfiles/blob/main/ghostty/glow.glsl -// "Chromatic Aberration": https://www.shadertoy.com/view/Mds3zn - -// sRGB linear -> nonlinear transform from https://bottosson.github.io/posts/colorwrong/ -float f(float x) { - if (x >= 0.0031308) { - return 1.055 * pow(x, 1.0 / 2.4) - 0.055; - } else { - return 12.92 * x; - } -} - -float f_inv(float x) { - if (x >= 0.04045) { - return pow((x + 0.055) / 1.055, 2.4); - } else { - return x / 12.92; - } -} - -// Oklab <-> linear sRGB conversions from https://bottosson.github.io/posts/oklab/ -vec4 toOklab(vec4 rgb) { - vec3 c = vec3(f_inv(rgb.r), f_inv(rgb.g), f_inv(rgb.b)); - float l = 0.4122214708 * c.r + 0.5363325363 * c.g + 0.0514459929 * c.b; - float m = 0.2119034982 * c.r + 0.6806995451 * c.g + 0.1073969566 * c.b; - float s = 0.0883024619 * c.r + 0.2817188376 * c.g + 0.6299787005 * c.b; - float l_ = pow(l, 1.0 / 3.0); - float m_ = pow(m, 1.0 / 3.0); - float s_ = pow(s, 1.0 / 3.0); - return vec4( - 0.2104542553 * l_ + 0.7936177850 * m_ - 0.0040720468 * s_, - 1.9779984951 * l_ - 2.4285922050 * m_ + 0.4505937099 * s_, - 0.0259040371 * l_ + 0.7827717662 * m_ - 0.8086757660 * s_, - rgb.a - ); -} - -vec4 toRgb(vec4 oklab) { - vec3 c = oklab.rgb; - float l_ = c.r + 0.3963377774 * c.g + 0.2158037573 * c.b; - float m_ = c.r - 0.1055613458 * c.g - 0.0638541728 * c.b; - float s_ = c.r - 0.0894841775 * c.g - 1.2914855480 * c.b; - float l = l_ * l_ * l_; - float m = m_ * m_ * m_; - float s = s_ * s_ * s_; - vec3 linear_srgb = vec3( - 4.0767416621 * l - 3.3077115913 * m + 0.2309699292 * s, - -1.2684380046 * l + 2.6097574011 * m - 0.3413193965 * s, - -0.0041960863 * l - 0.7034186147 * m + 1.7076147010 * s - ); - return vec4( - clamp(f(linear_srgb.r), 0.0, 1.0), - clamp(f(linear_srgb.g), 0.0, 1.0), - clamp(f(linear_srgb.b), 0.0, 1.0), - oklab.a - ); -} - -// Bloom samples from https://gist.github.com/qwerasd205/c3da6c610c8ffe17d6d2d3cc7068f17f -const vec3[24] samples = { - vec3(0.1693761725038636, 0.9855514761735895, 1), - vec3(-1.333070830962943, 0.4721463328627773, 0.7071067811865475), - vec3(-0.8464394909806497, -1.51113870578065, 0.5773502691896258), - vec3(1.554155680728463, -1.2588090085709776, 0.5), - vec3(1.681364377589461, 1.4741145918052656, 0.4472135954999579), - vec3(-1.2795157692199817, 2.088741103228784, 0.4082482904638631), - vec3(-2.4575847530631187, -0.9799373355024756, 0.3779644730092272), - vec3(0.5874641440200847, -2.7667464429345077, 0.35355339059327373), - vec3(2.997715703369726, 0.11704939884745152, 0.3333333333333333), - vec3(0.41360842451688395, 3.1351121305574803, 0.31622776601683794), - vec3(-3.167149933769243, 0.9844599011770256, 0.30151134457776363), - vec3(-1.5736713846521535, -3.0860263079123245, 0.2886751345948129), - vec3(2.888202648340422, -2.1583061557896213, 0.2773500981126146), - vec3(2.7150778983300325, 2.5745586041105715, 0.2672612419124244), - vec3(-2.1504069972377464, 3.2211410627650165, 0.2581988897471611), - vec3(-3.6548858794907493, -1.6253643308191343, 0.25), - vec3(1.0130775986052671, -3.9967078676335834, 0.24253562503633297), - vec3(4.229723673607257, 0.33081361055181563, 0.23570226039551587), - vec3(0.40107790291173834, 4.340407413572593, 0.22941573387056174), - vec3(-4.319124570236028, 1.159811599693438, 0.22360679774997896), - vec3(-1.9209044802827355, -4.160543952132907, 0.2182178902359924), - vec3(3.8639122286635708, -2.6589814382925123, 0.21320071635561041), - vec3(3.3486228404946234, 3.4331800232609, 0.20851441405707477), - vec3(-2.8769733643574344, 3.9652268864187157, 0.20412414523193154) -}; - -float offsetFunction(float iTime) { - float amount = 1.0; - const float periods[4] = {6.0, 16.0, 19.0, 27.0}; - for (int i = 0; i < 4; i++) { - amount *= 1.0 + 0.5 * sin(iTime*periods[i]); - } - //return amount; - return amount * periods[3]; -} - -const float DIM_CUTOFF = 0.35; -const float BRIGHT_CUTOFF = 0.65; -const float ABBERATION_FACTOR = 0.05; - -void mainImage(out vec4 fragColor, in vec2 fragCoord) { - vec2 uv = fragCoord.xy / iResolution.xy; - - float amount = offsetFunction(iTime); - - vec3 col; - col.r = texture( iChannel0, vec2(uv.x-ABBERATION_FACTOR*amount / iResolution.x, uv.y) ).r; - col.g = texture( iChannel0, uv ).g; - col.b = texture( iChannel0, vec2(uv.x+ABBERATION_FACTOR*amount / iResolution.x, uv.y) ).b; - - vec4 splittedColor = vec4(col, 1.0); - vec4 source = toOklab(splittedColor); - vec4 dest = source; - - if (source.x > DIM_CUTOFF) { - dest.x *= 1.2; - // dest.x = 1.2; - } else { - vec2 step = vec2(1.414) / iResolution.xy; - vec3 glow = vec3(0.0); - for (int i = 0; i < 24; i++) { - vec3 s = samples[i]; - float weight = s.z; - vec4 c = toOklab(texture(iChannel0, uv + s.xy * step)); - if (c.x > DIM_CUTOFF) { - glow.yz += c.yz * weight * 0.3; - if (c.x <= BRIGHT_CUTOFF) { - glow.x += c.x * weight * 0.05; - } else { - glow.x += c.x * weight * 0.10; - } - } - } - // float lightness_diff = clamp(glow.x - dest.x, 0.0, 1.0); - // dest.x = lightness_diff; - // dest.yz = dest.yz * (1.0 - lightness_diff) + glow.yz * lightness_diff; - dest.xyz += glow.xyz; - dest.a = 0.5; - } - - fragColor = toRgb(dest); -} diff --git a/home-manager/modules/git/default.nix b/home-manager/modules/git/default.nix index 9dd52b3..183f808 100644 --- a/home-manager/modules/git/default.nix +++ b/home-manager/modules/git/default.nix @@ -15,9 +15,9 @@ in { lfs.enable = true; extraConfig = { user = { - name = "Lily"; - email = "Caznix01@gmail.com"; - signingKey = "Caznix"; + name = "Lily Vex"; + email = "lesson085@gmail.com"; + signingKey = "Placeholder"; }; commit.gpgsign = true; init.defaultBranch = "main"; diff --git a/home-manager/modules/kitty/default.nix b/home-manager/modules/kitty/default.nix new file mode 100644 index 0000000..cf0b4c3 --- /dev/null +++ b/home-manager/modules/kitty/default.nix @@ -0,0 +1,22 @@ +{ + config, + lib, + ... +}: let + cfg = config.lily.kitty; +in { + options.lily.kitty = { + enable = lib.mkEnableOption "activate kitty"; + }; + + config = lib.mkIf cfg.enable { + programs.kitty = { + enable = true; + + settings = { + confirm_os_window_close = 0; + window_padding_width = 5; + }; + }; + }; +} diff --git a/home-manager/modules/zed/default.nix b/home-manager/modules/zed/default.nix deleted file mode 100644 index 9d3fe02..0000000 --- a/home-manager/modules/zed/default.nix +++ /dev/null @@ -1,103 +0,0 @@ -{ - config, - lib, - pkgs, - ... -}: let - cfg = config.lily.zed; -in { - options.lily.zed = { - enable = lib.mkEnableOption "activate zed"; - }; - - config = lib.mkIf cfg.enable { - programs.zed-editor = { - enable = true; - extensions = ["nix" "toml" "elixir" "make"]; - - ## everything inside of these brackets are Zed options. - userSettings = { - assistant = { - enabled = true; - version = "2"; - default_open_ai_model = null; - ### PROVIDER OPTIONS - ### zed.dev models { claude-3-5-sonnet-latest } requires github connected - ### anthropic models { claude-3-5-sonnet-latest claude-3-haiku-latest claude-3-opus-latest } requires API_KEY - ### copilot_chat models { gpt-4o gpt-4 gpt-3.5-turbo o1-preview } requires github connected - default_model = { - provider = "zed.dev"; - model = "claude-3-5-sonnet-latest"; - }; - - # inline_alternatives = [ - # { - # provider = "copilot_chat"; - # model = "gpt-3.5-turbo"; - # } - # ]; - }; - - node = { - path = lib.getExe pkgs.nodejs; - npm_path = lib.getExe' pkgs.nodejs "npm"; - }; - - hour_format = "hour24"; - auto_update = false; - terminal = { - alternate_scroll = "off"; - blinking = "off"; - copy_on_select = false; - dock = "bottom"; - detect_venv = { - on = { - directories = [".env" "env" ".venv" "venv"]; - activate_script = "default"; - }; - }; - font_family = "JetBrains Mono"; - font_features = null; - font_size = null; - line_height = "comfortable"; - option_as_meta = false; - button = false; - shell = { - program = "zsh"; - }; - toolbar = { - title = true; - }; - working_directory = "current_project_directory"; - }; - - lsp = { - rust-analyzer = { - binary = { - path = "/run/current-system/sw/bin/rust-analyzer"; - path_lookup = false; - }; - }; - nix = { - binary = { - path = "${pkgs.nixd}/bin/nixd"; - path_lookup = false; - }; - }; - }; - - vim_mode = false; # Not yet... - load_direnv = "shell_hook"; - base_keymap = "VSCode"; - theme = { - mode = "system"; - light = "One Light"; - dark = "Andromeda"; - }; - show_whitespaces = "all"; - ui_font_size = 16; - buffer_font_size = 16; - }; - }; - }; -} diff --git a/home-manager/nix/home.nix b/home-manager/nix/home.nix index b22df90..44c5b44 100644 --- a/home-manager/nix/home.nix +++ b/home-manager/nix/home.nix @@ -42,7 +42,7 @@ # Or define it inline, for example: # (final: prev: { # hi = final.hello.overrideAttrs (oldAttrs: { - # patches = [ ./change-hello-to-hi.patch ]; + # patches = [ ./change-hello-to-hi.patch ]; # }); # }) ]; @@ -57,15 +57,12 @@ username = "lily"; homeDirectory = "/home/lily"; packages = with pkgs; # installs a package - [ vesktop + inputs.zen-browser.packages."${system}".default (prismlauncher.override { jdks = [jdk23 jdk8 jdk17 jdk21]; }) - itch - inputs.nix-gaming.packages.${pkgs.system}.viper - kdePackages.kate ]; }; diff --git a/home-manager/profiles/desktop.nix b/home-manager/profiles/desktop.nix index 00cfd63..0118353 100644 --- a/home-manager/profiles/desktop.nix +++ b/home-manager/profiles/desktop.nix @@ -8,13 +8,10 @@ }; lily = { hyprland.enable = true; - ghostty.enable = true; + kitty.enable = true; neovim.enable = true; rofi.enable = true; - vscode.enable = true; - zed.enable = true; waybar.enable = true; - chromium.enable = true; }; home.packages = with pkgs; [ vesktop diff --git a/machines/nix/configuration.nix b/machines/nix/configuration.nix index 05600e5..1978450 100644 --- a/machines/nix/configuration.nix +++ b/machines/nix/configuration.nix @@ -25,12 +25,10 @@ ]; lily = { users.lily.enable = true; - laptop.enable = true; common.enable = true; containers = { enable = true; - podman = true; - # docker = false; + docker = true; }; nvidia.enable = true; desktop = { @@ -64,7 +62,6 @@ platformOptimizations.enable = true; localNetworkGameTransfers.openFirewall = true; gamescopeSession.enable = true; - extraCompatPackages = let gamePkgs = inputs.nix-gaming.packages.${pkgs.hostPlatform.system}; in [pkgs.proton-ge-bin gamePkgs.northstar-proton]; }; }; diff --git a/machines/nix/hardware-configuration.nix b/machines/nix/hardware-configuration.nix index 6be9341..8ca010a 100644 --- a/machines/nix/hardware-configuration.nix +++ b/machines/nix/hardware-configuration.nix @@ -1,44 +1,38 @@ # 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, ... }: + { - config, - lib, - pkgs, - modulesPath, - ... -}: { - imports = [ - (modulesPath + "/installer/scan/not-detected.nix") - ]; + imports = + [ (modulesPath + "/installer/scan/not-detected.nix") + ]; - boot.initrd.availableKernelModules = ["xhci_pci" "thunderbolt" "nvme" "usb_storage" "usbhid" "sd_mod" "rtsx_pci_sdmmc"]; - boot.initrd.kernelModules = []; - boot.kernelModules = ["kvm-intel"]; - boot.extraModulePackages = []; + boot.initrd.availableKernelModules = [ "xhci_pci" "ahci" "nvme" "usbhid" "sd_mod" ]; + boot.initrd.kernelModules = [ ]; + boot.kernelModules = [ "kvm-intel" ]; + boot.extraModulePackages = [ ]; - fileSystems."/" = { - device = "/dev/disk/by-uuid/95c3ec11-8329-4b54-a690-97c31250a110"; - fsType = "btrfs"; - options = ["subvol=@"]; - }; + fileSystems."/" = + { device = "/dev/disk/by-uuid/c42aa8fb-f19a-41eb-9ff3-f77d4c1d7ba7"; + fsType = "ext4"; + }; - fileSystems."/boot" = { - device = "/dev/disk/by-uuid/9666-823F"; - fsType = "vfat"; - options = ["fmask=0077" "dmask=0077"]; - }; + fileSystems."/boot" = + { device = "/dev/disk/by-uuid/F2AC-C759"; + fsType = "vfat"; + options = [ "fmask=0022" "dmask=0022" ]; + }; - swapDevices = [ - {device = "/dev/disk/by-uuid/5fd02c5b-4ce0-46be-8771-9c1b0d280d8d";} - ]; + swapDevices = [ ]; # 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.wlp92s0.useDHCP = lib.mkDefault true; + # networking.interfaces.enp2s0.useDHCP = lib.mkDefault true; + # networking.interfaces.wlp3s0.useDHCP = lib.mkDefault true; nixpkgs.hostPlatform = lib.mkDefault "x86_64-linux"; hardware.cpu.intel.updateMicrocode = lib.mkDefault config.hardware.enableRedistributableFirmware; diff --git a/modules/hardware/nvidia.nix b/modules/hardware/nvidia.nix index c57a737..37ae81c 100644 --- a/modules/hardware/nvidia.nix +++ b/modules/hardware/nvidia.nix @@ -57,7 +57,7 @@ in { # https://github.com/NVIDIA/open-gpu-kernel-modules#compatible-gpus # Only available from driver 515.43.04+ # Currently alpha-quality/buggy, so false is currently the recommended setting. - open = true; + open = false; # Optionally, you may need to select the appropriate driver version for your specific GPU. package = config.boot.kernelPackages.nvidiaPackages.stable; From 56eea25ec57e74e842843b1fb1005f28f92825fe Mon Sep 17 00:00:00 2001 From: Lily Vex Date: Sat, 29 Mar 2025 23:27:46 -0400 Subject: [PATCH 046/102] fix: incorrect gpg key and home-manager package location --- flake.lock | 62 ++++++++++++++--------- flake.nix | 1 - home-manager/modules/git/default.nix | 2 +- home-manager/modules/hyprland/default.nix | 2 +- home-manager/nix/home.nix | 12 ----- home-manager/profiles/desktop.nix | 4 +- machines/nix/hardware-configuration.nix | 6 +-- modules/common/common.nix | 3 +- 8 files changed, 47 insertions(+), 45 deletions(-) diff --git a/flake.lock b/flake.lock index d527f10..caf3549 100644 --- a/flake.lock +++ b/flake.lock @@ -128,11 +128,11 @@ ] }, "locked": { - "lastModified": 1742234739, - "narHash": "sha256-zFL6zsf/5OztR1NSNQF33dvS1fL/BzVUjabZq4qrtY4=", + "lastModified": 1742655702, + "narHash": "sha256-jbqlw4sPArFtNtA1s3kLg7/A4fzP4GLk9bGbtUJg0JQ=", "owner": "nix-community", "repo": "home-manager", - "rev": "f6af7280a3390e65c2ad8fd059cdc303426cbd59", + "rev": "0948aeedc296f964140d9429223c7e4a0702a1ff", "type": "github" }, "original": { @@ -176,11 +176,11 @@ "nixpkgs": "nixpkgs_2" }, "locked": { - "lastModified": 1742262357, - "narHash": "sha256-6JGR5I4cuFFun3AJKPnMPz6PKUPywIH+AFYROUFRvYQ=", + "lastModified": 1743299372, + "narHash": "sha256-vFuxkHPd+Xpi5Bx1VCyZwYl/BbF83C+KmlbPBNVJvNU=", "owner": "fufexan", "repo": "nix-gaming", - "rev": "53eda8bba79a2c28782734bca51d70ecffb82d74", + "rev": "2ab0a37308559926bddb0009dfcf16a2a5b34e2b", "type": "github" }, "original": { @@ -222,11 +222,11 @@ }, "nixpkgs-unstable": { "locked": { - "lastModified": 1742288794, - "narHash": "sha256-Txwa5uO+qpQXrNG4eumPSD+hHzzYi/CdaM80M9XRLCo=", + "lastModified": 1743095683, + "narHash": "sha256-gWd4urRoLRe8GLVC/3rYRae1h+xfQzt09xOfb0PaHSk=", "owner": "nixos", "repo": "nixpkgs", - "rev": "b6eaf97c6960d97350c584de1b6dcff03c9daf42", + "rev": "5e5402ecbcb27af32284d4a62553c019a3a49ea6", "type": "github" }, "original": { @@ -238,11 +238,11 @@ }, "nixpkgs_2": { "locked": { - "lastModified": 1741865919, - "narHash": "sha256-4thdbnP6dlbdq+qZWTsm4ffAwoS8Tiq1YResB+RP6WE=", + "lastModified": 1743076231, + "narHash": "sha256-yQugdVfi316qUfqzN8JMaA2vixl+45GxNm4oUfXlbgw=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "573c650e8a14b2faa0041645ab18aed7e60f0c9a", + "rev": "6c5963357f3c1c840201eda129a99d455074db04", "type": "github" }, "original": { @@ -254,11 +254,11 @@ }, "nixpkgs_3": { "locked": { - "lastModified": 1742268799, - "narHash": "sha256-IhnK4LhkBlf14/F8THvUy3xi/TxSQkp9hikfDZRD4Ic=", + "lastModified": 1743231893, + "narHash": "sha256-tpJsHMUPEhEnzySoQxx7+kA+KUtgWqvlcUBqROYNNt0=", "owner": "nixos", "repo": "nixpkgs", - "rev": "da044451c6a70518db5b730fe277b70f494188f1", + "rev": "c570c1f5304493cafe133b8d843c7c1c4a10d3a6", "type": "github" }, "original": { @@ -268,6 +268,22 @@ "type": "github" } }, + "nixpkgs_4": { + "locked": { + "lastModified": 1743095683, + "narHash": "sha256-gWd4urRoLRe8GLVC/3rYRae1h+xfQzt09xOfb0PaHSk=", + "owner": "nixos", + "repo": "nixpkgs", + "rev": "5e5402ecbcb27af32284d4a62553c019a3a49ea6", + "type": "github" + }, + "original": { + "owner": "nixos", + "ref": "nixos-unstable", + "repo": "nixpkgs", + "type": "github" + } + }, "nixvim": { "inputs": { "flake-parts": "flake-parts_2", @@ -277,11 +293,11 @@ "nuschtosSearch": "nuschtosSearch" }, "locked": { - "lastModified": 1742396414, - "narHash": "sha256-e9Uv44rVDAG2ohNejttl9Pq5r4dxIzWxt+1hvKTQK5E=", + "lastModified": 1743288994, + "narHash": "sha256-hUlfAcIUnS8/eSFq+uzOHPZO1p8QgBTAoqhDWzEkUto=", "owner": "nix-community", "repo": "nixvim", - "rev": "d79c291d5d80d587d518e0f530cc55adb0638c80", + "rev": "81fdde9fc529e0a5f9ff0d570f31acfe85fd20ac", "type": "github" }, "original": { @@ -300,11 +316,11 @@ ] }, "locked": { - "lastModified": 1741886583, - "narHash": "sha256-sScfYKtxp3CYv5fJcHQDvQjqBL+tPNQqS9yf9Putd+s=", + "lastModified": 1742659553, + "narHash": "sha256-i/JCrr/jApVorI9GkSV5to+USrRCa0rWuQDH8JSlK2A=", "owner": "NuschtOS", "repo": "search", - "rev": "2974bc5fa3441a319fba943f3ca41f7dcd1a1467", + "rev": "508752835128a3977985a4d5225ff241f7756181", "type": "github" }, "original": { @@ -356,9 +372,7 @@ }, "zen-browser": { "inputs": { - "nixpkgs": [ - "nixpkgs" - ] + "nixpkgs": "nixpkgs_4" }, "locked": { "lastModified": 1743216975, diff --git a/flake.nix b/flake.nix index 90c4770..ef851be 100644 --- a/flake.nix +++ b/flake.nix @@ -16,7 +16,6 @@ nixvim.inputs.nixpkgs.follows = "nixpkgs"; nix-gaming.url = "github:fufexan/nix-gaming"; zen-browser.url = "github:0xc000022070/zen-browser-flake"; - zen-browser.inputs.nixpkgs.follows = "nixpkgs"; }; outputs = { diff --git a/home-manager/modules/git/default.nix b/home-manager/modules/git/default.nix index 183f808..76d4e61 100644 --- a/home-manager/modules/git/default.nix +++ b/home-manager/modules/git/default.nix @@ -17,7 +17,7 @@ in { user = { name = "Lily Vex"; email = "lesson085@gmail.com"; - signingKey = "Placeholder"; + signingKey = "Lily Vex"; }; commit.gpgsign = true; init.defaultBranch = "main"; diff --git a/home-manager/modules/hyprland/default.nix b/home-manager/modules/hyprland/default.nix index 1651a5c..2854dcd 100644 --- a/home-manager/modules/hyprland/default.nix +++ b/home-manager/modules/hyprland/default.nix @@ -58,7 +58,7 @@ in { "$alt_super $super,Q,exit" # Screenshot region "$super SHIFT,S, exec, GRIM_DEFAULT_DIR=${config.home.homeDirectory}/Pictures/Screenshots/ ${pkgs.grim}/bin/grim -g \"$(${pkgs.slurp}/bin/slurp)\" - | wl-copy " - "$super,T, exec, ghostty" + "$super,T, exec, kitty" "$super, L,exec, hyprlock --immediate" "$super, B,exec, chromium" "$super,F,fullscreen" diff --git a/home-manager/nix/home.nix b/home-manager/nix/home.nix index 44c5b44..b37dd61 100644 --- a/home-manager/nix/home.nix +++ b/home-manager/nix/home.nix @@ -17,12 +17,8 @@ # You can also split up your configuration and import pieces of it here: # ./nvim.nix ../applications/git.nix - ../applications/chromium.nix - ../applications/git.nix ../applications/zsh.nix ../applications/direnv.nix - ../applications/vscode.nix - ../applications/ghostty ../applications/hyprland ../applications/neovim inputs.nixvim.homeManagerModules.nixvim @@ -56,14 +52,6 @@ home = { username = "lily"; homeDirectory = "/home/lily"; - packages = with pkgs; # installs a package - [ - vesktop - inputs.zen-browser.packages."${system}".default - (prismlauncher.override { - jdks = [jdk23 jdk8 jdk17 jdk21]; - }) - ]; }; # Add stuff for your user as you see fit: diff --git a/home-manager/profiles/desktop.nix b/home-manager/profiles/desktop.nix index 0118353..3755a57 100644 --- a/home-manager/profiles/desktop.nix +++ b/home-manager/profiles/desktop.nix @@ -1,4 +1,4 @@ -{pkgs, ...}: { +{pkgs, inputs, ...}: { imports = [ ./main.nix ]; @@ -15,5 +15,7 @@ }; home.packages = with pkgs; [ vesktop + inputs.zen-browser.packages."${system}".default + hyfetch ]; } diff --git a/machines/nix/hardware-configuration.nix b/machines/nix/hardware-configuration.nix index 8ca010a..947cd48 100644 --- a/machines/nix/hardware-configuration.nix +++ b/machines/nix/hardware-configuration.nix @@ -8,18 +8,18 @@ [ (modulesPath + "/installer/scan/not-detected.nix") ]; - boot.initrd.availableKernelModules = [ "xhci_pci" "ahci" "nvme" "usbhid" "sd_mod" ]; + boot.initrd.availableKernelModules = [ "xhci_pci" "ahci" "nvme" "usbhid" "usb_storage" "sd_mod" ]; boot.initrd.kernelModules = [ ]; boot.kernelModules = [ "kvm-intel" ]; boot.extraModulePackages = [ ]; fileSystems."/" = - { device = "/dev/disk/by-uuid/c42aa8fb-f19a-41eb-9ff3-f77d4c1d7ba7"; + { device = "/dev/disk/by-uuid/352a9d74-fd89-4117-bfde-f7cc6573e6da"; fsType = "ext4"; }; fileSystems."/boot" = - { device = "/dev/disk/by-uuid/F2AC-C759"; + { device = "/dev/disk/by-uuid/6080-50C4"; fsType = "vfat"; options = [ "fmask=0022" "dmask=0022" ]; }; diff --git a/modules/common/common.nix b/modules/common/common.nix index f8dd76f..3e5c2b3 100644 --- a/modules/common/common.nix +++ b/modules/common/common.nix @@ -12,7 +12,7 @@ in { enable = true; enableSSHSupport = true; }; - services.openssh.enable = true; + services.openssh.enable = false; programs.zsh.enable = true; environment.systemPackages = with pkgs; [ git @@ -20,7 +20,6 @@ in { toybox util-linux tmux - ghostty # encryption and filesystem cryptsetup From 689cd5014893233a05df49382225ebf1b29fae3f Mon Sep 17 00:00:00 2001 From: lily Date: Sun, 30 Mar 2025 00:25:15 -0400 Subject: [PATCH 047/102] misc: formatting changes --- flake.lock | 81 +++++++++++++++++++++++++--- home-manager/modules/git/default.nix | 2 +- modules/plasma/default.nix | 2 + 3 files changed, 78 insertions(+), 7 deletions(-) diff --git a/flake.lock b/flake.lock index caf3549..37585c5 100644 --- a/flake.lock +++ b/flake.lock @@ -84,7 +84,7 @@ }, "flake-utils": { "inputs": { - "systems": "systems_2" + "systems": "systems_3" }, "locked": { "lastModified": 1731533236, @@ -170,10 +170,29 @@ "type": "github" } }, + "kwin-effects-forceblur": { + "inputs": { + "nixpkgs": "nixpkgs_2", + "utils": "utils" + }, + "locked": { + "lastModified": 1740651704, + "narHash": "sha256-s6pe3osipbo+GZVAB6LycyOsYcdvC12OJzuQRVptVZE=", + "owner": "taj-ny", + "repo": "kwin-effects-forceblur", + "rev": "1c8dcf1a471b13ada1e37f468de71e115148353f", + "type": "github" + }, + "original": { + "owner": "taj-ny", + "repo": "kwin-effects-forceblur", + "type": "github" + } + }, "nix-gaming": { "inputs": { "flake-parts": "flake-parts", - "nixpkgs": "nixpkgs_2" + "nixpkgs": "nixpkgs_3" }, "locked": { "lastModified": 1743299372, @@ -237,6 +256,22 @@ } }, "nixpkgs_2": { + "locked": { + "lastModified": 1730200266, + "narHash": "sha256-l253w0XMT8nWHGXuXqyiIC/bMvh1VRszGXgdpQlfhvU=", + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "807e9154dcb16384b1b765ebe9cd2bba2ac287fd", + "type": "github" + }, + "original": { + "owner": "NixOS", + "ref": "nixos-unstable", + "repo": "nixpkgs", + "type": "github" + } + }, + "nixpkgs_3": { "locked": { "lastModified": 1743076231, "narHash": "sha256-yQugdVfi316qUfqzN8JMaA2vixl+45GxNm4oUfXlbgw=", @@ -252,7 +287,7 @@ "type": "github" } }, - "nixpkgs_3": { + "nixpkgs_4": { "locked": { "lastModified": 1743231893, "narHash": "sha256-tpJsHMUPEhEnzySoQxx7+kA+KUtgWqvlcUBqROYNNt0=", @@ -268,7 +303,7 @@ "type": "github" } }, - "nixpkgs_4": { + "nixpkgs_5": { "locked": { "lastModified": 1743095683, "narHash": "sha256-gWd4urRoLRe8GLVC/3rYRae1h+xfQzt09xOfb0PaHSk=", @@ -333,8 +368,9 @@ "inputs": { "agenix": "agenix", "home-manager": "home-manager_2", + "kwin-effects-forceblur": "kwin-effects-forceblur", "nix-gaming": "nix-gaming", - "nixpkgs": "nixpkgs_3", + "nixpkgs": "nixpkgs_4", "nixpkgs-unstable": "nixpkgs-unstable", "nixvim": "nixvim", "zen-browser": "zen-browser" @@ -370,9 +406,42 @@ "type": "github" } }, + "systems_3": { + "locked": { + "lastModified": 1681028828, + "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=", + "owner": "nix-systems", + "repo": "default", + "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e", + "type": "github" + }, + "original": { + "owner": "nix-systems", + "repo": "default", + "type": "github" + } + }, + "utils": { + "inputs": { + "systems": "systems_2" + }, + "locked": { + "lastModified": 1726560853, + "narHash": "sha256-X6rJYSESBVr3hBoH0WbKE5KvhPU5bloyZ2L4K60/fPQ=", + "owner": "numtide", + "repo": "flake-utils", + "rev": "c1dfcf08411b08f6b8615f7d8971a2bfa81d5e8a", + "type": "github" + }, + "original": { + "owner": "numtide", + "repo": "flake-utils", + "type": "github" + } + }, "zen-browser": { "inputs": { - "nixpkgs": "nixpkgs_4" + "nixpkgs": "nixpkgs_5" }, "locked": { "lastModified": 1743216975, diff --git a/home-manager/modules/git/default.nix b/home-manager/modules/git/default.nix index 76d4e61..fefbd88 100644 --- a/home-manager/modules/git/default.nix +++ b/home-manager/modules/git/default.nix @@ -15,7 +15,7 @@ in { lfs.enable = true; extraConfig = { user = { - name = "Lily Vex"; + name = "lily"; email = "lesson085@gmail.com"; signingKey = "Lily Vex"; }; diff --git a/modules/plasma/default.nix b/modules/plasma/default.nix index 463113f..2939da2 100644 --- a/modules/plasma/default.nix +++ b/modules/plasma/default.nix @@ -1,6 +1,8 @@ { lib, config, + pkgs, + inputs, ... }: let cfg = config.lily.plasma; From bf962b328cdaff592ba21de02ba474f8fc795bf7 Mon Sep 17 00:00:00 2001 From: lily Date: Tue, 1 Apr 2025 12:16:35 -0400 Subject: [PATCH 048/102] add: customize waybar --- flake.lock | 124 +++-------- flake.nix | 4 +- home-manager/modules/hyprland/default.nix | 19 +- home-manager/modules/kitty/default.nix | 3 + home-manager/modules/neovim/default.nix | 2 +- home-manager/modules/waybar/default.nix | 165 +++++++++++++- home-manager/modules/waybar/default.nix.old | 203 ++++++++++++++++++ home-manager/modules/waybar/style.css | 108 ++++++++++ home-manager/modules/waybar/style.css.old | 153 +++++++++++++ .../waybar/themes/Catppuccin-Latte.css | 26 +++ .../waybar/themes/Catppuccin-Mocha.css | 25 +++ home-manager/modules/waybar/themes/theme.css | 26 +++ home-manager/profiles/desktop.nix | 6 + modules/common/desktop.nix | 10 +- modules/wayland/default.nix | 2 +- 15 files changed, 754 insertions(+), 122 deletions(-) create mode 100644 home-manager/modules/waybar/default.nix.old create mode 100644 home-manager/modules/waybar/style.css create mode 100644 home-manager/modules/waybar/style.css.old create mode 100644 home-manager/modules/waybar/themes/Catppuccin-Latte.css create mode 100644 home-manager/modules/waybar/themes/Catppuccin-Mocha.css create mode 100644 home-manager/modules/waybar/themes/theme.css diff --git a/flake.lock b/flake.lock index 37585c5..a8aa53d 100644 --- a/flake.lock +++ b/flake.lock @@ -84,7 +84,7 @@ }, "flake-utils": { "inputs": { - "systems": "systems_3" + "systems": "systems_2" }, "locked": { "lastModified": 1731533236, @@ -128,16 +128,15 @@ ] }, "locked": { - "lastModified": 1742655702, - "narHash": "sha256-jbqlw4sPArFtNtA1s3kLg7/A4fzP4GLk9bGbtUJg0JQ=", + "lastModified": 1743360001, + "narHash": "sha256-HtpS/ZdgWXw0y+aFdORcX5RuBGTyz3WskThspNR70SM=", "owner": "nix-community", "repo": "home-manager", - "rev": "0948aeedc296f964140d9429223c7e4a0702a1ff", + "rev": "b6fd653ef8fbeccfd4958650757e91767a65506d", "type": "github" }, "original": { "owner": "nix-community", - "ref": "release-24.11", "repo": "home-manager", "type": "github" } @@ -170,29 +169,10 @@ "type": "github" } }, - "kwin-effects-forceblur": { - "inputs": { - "nixpkgs": "nixpkgs_2", - "utils": "utils" - }, - "locked": { - "lastModified": 1740651704, - "narHash": "sha256-s6pe3osipbo+GZVAB6LycyOsYcdvC12OJzuQRVptVZE=", - "owner": "taj-ny", - "repo": "kwin-effects-forceblur", - "rev": "1c8dcf1a471b13ada1e37f468de71e115148353f", - "type": "github" - }, - "original": { - "owner": "taj-ny", - "repo": "kwin-effects-forceblur", - "type": "github" - } - }, "nix-gaming": { "inputs": { "flake-parts": "flake-parts", - "nixpkgs": "nixpkgs_3" + "nixpkgs": "nixpkgs_2" }, "locked": { "lastModified": 1743299372, @@ -256,22 +236,6 @@ } }, "nixpkgs_2": { - "locked": { - "lastModified": 1730200266, - "narHash": "sha256-l253w0XMT8nWHGXuXqyiIC/bMvh1VRszGXgdpQlfhvU=", - "owner": "NixOS", - "repo": "nixpkgs", - "rev": "807e9154dcb16384b1b765ebe9cd2bba2ac287fd", - "type": "github" - }, - "original": { - "owner": "NixOS", - "ref": "nixos-unstable", - "repo": "nixpkgs", - "type": "github" - } - }, - "nixpkgs_3": { "locked": { "lastModified": 1743076231, "narHash": "sha256-yQugdVfi316qUfqzN8JMaA2vixl+45GxNm4oUfXlbgw=", @@ -287,23 +251,7 @@ "type": "github" } }, - "nixpkgs_4": { - "locked": { - "lastModified": 1743231893, - "narHash": "sha256-tpJsHMUPEhEnzySoQxx7+kA+KUtgWqvlcUBqROYNNt0=", - "owner": "nixos", - "repo": "nixpkgs", - "rev": "c570c1f5304493cafe133b8d843c7c1c4a10d3a6", - "type": "github" - }, - "original": { - "owner": "nixos", - "ref": "nixos-24.11", - "repo": "nixpkgs", - "type": "github" - } - }, - "nixpkgs_5": { + "nixpkgs_3": { "locked": { "lastModified": 1743095683, "narHash": "sha256-gWd4urRoLRe8GLVC/3rYRae1h+xfQzt09xOfb0PaHSk=", @@ -319,6 +267,22 @@ "type": "github" } }, + "nixpkgs_4": { + "locked": { + "lastModified": 1742288794, + "narHash": "sha256-Txwa5uO+qpQXrNG4eumPSD+hHzzYi/CdaM80M9XRLCo=", + "owner": "nixos", + "repo": "nixpkgs", + "rev": "b6eaf97c6960d97350c584de1b6dcff03c9daf42", + "type": "github" + }, + "original": { + "owner": "nixos", + "ref": "nixos-unstable", + "repo": "nixpkgs", + "type": "github" + } + }, "nixvim": { "inputs": { "flake-parts": "flake-parts_2", @@ -328,11 +292,11 @@ "nuschtosSearch": "nuschtosSearch" }, "locked": { - "lastModified": 1743288994, - "narHash": "sha256-hUlfAcIUnS8/eSFq+uzOHPZO1p8QgBTAoqhDWzEkUto=", + "lastModified": 1743362786, + "narHash": "sha256-XbXIRDbb8/vLBX1M096l7lM5wfzBTp1ZXfUl9bUhVGU=", "owner": "nix-community", "repo": "nixvim", - "rev": "81fdde9fc529e0a5f9ff0d570f31acfe85fd20ac", + "rev": "d81f37256d0a8691b837b74979d27bf89be8ecdd", "type": "github" }, "original": { @@ -368,9 +332,8 @@ "inputs": { "agenix": "agenix", "home-manager": "home-manager_2", - "kwin-effects-forceblur": "kwin-effects-forceblur", "nix-gaming": "nix-gaming", - "nixpkgs": "nixpkgs_4", + "nixpkgs": "nixpkgs_3", "nixpkgs-unstable": "nixpkgs-unstable", "nixvim": "nixvim", "zen-browser": "zen-browser" @@ -406,42 +369,9 @@ "type": "github" } }, - "systems_3": { - "locked": { - "lastModified": 1681028828, - "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=", - "owner": "nix-systems", - "repo": "default", - "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e", - "type": "github" - }, - "original": { - "owner": "nix-systems", - "repo": "default", - "type": "github" - } - }, - "utils": { - "inputs": { - "systems": "systems_2" - }, - "locked": { - "lastModified": 1726560853, - "narHash": "sha256-X6rJYSESBVr3hBoH0WbKE5KvhPU5bloyZ2L4K60/fPQ=", - "owner": "numtide", - "repo": "flake-utils", - "rev": "c1dfcf08411b08f6b8615f7d8971a2bfa81d5e8a", - "type": "github" - }, - "original": { - "owner": "numtide", - "repo": "flake-utils", - "type": "github" - } - }, "zen-browser": { "inputs": { - "nixpkgs": "nixpkgs_5" + "nixpkgs": "nixpkgs_4" }, "locked": { "lastModified": 1743216975, diff --git a/flake.nix b/flake.nix index ef851be..1d651bb 100644 --- a/flake.nix +++ b/flake.nix @@ -3,14 +3,14 @@ inputs = { # Nixpkgs - nixpkgs.url = "github:nixos/nixpkgs/nixos-24.11"; + nixpkgs.url = "github:nixos/nixpkgs/nixos-unstable"; # You can access packages and modules from different nixpkgs revs # at the same time. Here's an working example: nixpkgs-unstable.url = "github:nixos/nixpkgs/nixos-unstable"; # Also see the 'unstable-packages' overlay at 'overlays/default.nix'. # Home manager home-manager.inputs.nixpkgs.follows = "nixpkgs"; - home-manager.url = "github:nix-community/home-manager/release-24.11"; + home-manager.url = "github:nix-community/home-manager"; agenix.url = "github:ryantm/agenix"; nixvim.url = "github:nix-community/nixvim"; nixvim.inputs.nixpkgs.follows = "nixpkgs"; diff --git a/home-manager/modules/hyprland/default.nix b/home-manager/modules/hyprland/default.nix index 2854dcd..ee97670 100644 --- a/home-manager/modules/hyprland/default.nix +++ b/home-manager/modules/hyprland/default.nix @@ -30,7 +30,7 @@ in { xray = true; }; }; - blurls = "waybar"; + # blurls = "waybar"; dwindle = { pseudotile = true; # Master switch for pseudotiling. Enabling is bound to mainMod + P in the keybinds section below preserve_split = true; # You probably want this @@ -40,8 +40,8 @@ in { extend_border_grab_area = 15; # Extends the clickable area around the border for resizing hover_icon_on_border = true; # Shows a cursor icon when layout = "dwindle"; - "col.active_border" = "rgba(C55900ee) rgba(FFAA63ee) 45deg"; - "col.inactive_border" = "rgba(595959aa)"; + "col.active_border" = "rgba(3A2BABFF) rgba(1A0B8AFF) 45deg"; + "col.inactive_border" = "rgba(110E29aa)"; border_size = 2; gaps_out = 10; }; @@ -49,6 +49,7 @@ in { "${pkgs.kdePackages.kwallet-pam}/libexec/pam_kwallet_init" "${pkgs.networkmanagerapplet}/bin/nm-applet" "${pkgs.blueman}/bin/blueman-applet" + "${pkgs.waybar}/bin/waybar" ]; "$super" = "SUPER"; "$alt_super" = "CTRL"; @@ -59,8 +60,8 @@ in { # Screenshot region "$super SHIFT,S, exec, GRIM_DEFAULT_DIR=${config.home.homeDirectory}/Pictures/Screenshots/ ${pkgs.grim}/bin/grim -g \"$(${pkgs.slurp}/bin/slurp)\" - | wl-copy " "$super,T, exec, kitty" - "$super, L,exec, hyprlock --immediate" - "$super, B,exec, chromium" + "$alt_super $super, L,exec, hyprlock --immediate" + "$super, B,exec, zen" "$super,F,fullscreen" "$super SHIFT,F,togglefloating" "$super,E,exec,kate" @@ -93,10 +94,10 @@ in { "$super, J, togglesplit" - "$super, left, movefocus, l" - "$super, right, movefocus, r" - "$super, up, movefocus, u" - "$super, down, movefocus, d" + "$super, h, movefocus, l" + "$super, l, movefocus, r" + "$super, k, movefocus, u" + "$super, j, movefocus, d" ]; bindm = [ "$super, mouse:272, movewindow" diff --git a/home-manager/modules/kitty/default.nix b/home-manager/modules/kitty/default.nix index cf0b4c3..041a9f8 100644 --- a/home-manager/modules/kitty/default.nix +++ b/home-manager/modules/kitty/default.nix @@ -16,6 +16,9 @@ in { settings = { confirm_os_window_close = 0; window_padding_width = 5; + background_opacity = "0.45"; + background_blur = 1; + dynamic_background_opacity = "yes"; }; }; }; diff --git a/home-manager/modules/neovim/default.nix b/home-manager/modules/neovim/default.nix index 0876035..df21584 100644 --- a/home-manager/modules/neovim/default.nix +++ b/home-manager/modules/neovim/default.nix @@ -8,7 +8,7 @@ cfg = config.lily.neovim; in { imports = [ - # ./colorscheme.nix + ./colorscheme.nix ./plugins ./keybinds.nix ]; diff --git a/home-manager/modules/waybar/default.nix b/home-manager/modules/waybar/default.nix index c94d579..effe73c 100644 --- a/home-manager/modules/waybar/default.nix +++ b/home-manager/modules/waybar/default.nix @@ -1,18 +1,161 @@ -{ - config, - lib, - ... -}: let +{ pkgs, config, lib, ... }: +let cfg = config.lily.waybar; -in { - options.lily.waybar = { - enable = lib.mkEnableOption "activate waybar"; - }; - +in +{ + options.lily.waybar.enable = lib.mkEnableOption "activate waybar"; config = lib.mkIf cfg.enable { + home.packages = with pkgs; [ + pavucontrol + networkmanagerapplet + blueman + ]; programs.waybar = { enable = true; - systemd.enable = true; + style = ./style.css; + + settings = { + mainBar = { + layer = "top"; + position = "top"; + height = 40; + # tray.icon-size = 15; + + modules-left = [ + "custom/icon" + "custom/separator" + "battery" + "custom/separator" + "custom/screenshot" + "tray" + "hyprland/workspaces" + ]; + + modules-center = [ "hyprland/window" ]; + modules-right = [ + "mpris" + "pulseaudio" + "network" + "clock" + ]; + + mpris = { + format = "{player_icon}{status_icon} [{position}/{length}] {title} - {artist}"; + tooltip-format = "{player_icon}{status_icon} [{position}/{length}] {title} - {artist}"; + title-len = 20; + artist-len = 10; + interval = 1; + player-icons = { + default = ""; + mpv = "🎵 "; + spotify = " "; + }; + status-icons = { + playing = "▶"; + stopped = "󰓛"; + paused = "󰏤"; + }; + on-click-middle = "playerctld shift"; + }; + + battery = { + interval = 30; + states = { + warning = 30; + critical = 15; + }; + format = "{icon} {capacity}%"; + format-charging = " {icon} {capacity}%"; + format-icons = [ " " " " " " " " ]; + max-length = 25; + }; + + pulseaudio = { + format = "{icon} {volume}"; + format-bluetooth = " "; + format-bluetooth-muted = " "; + format-muted = ""; + format-icons = { + default = [ "" "󰕾" "" ]; + }; + on-click = "${pkgs.pavucontrol}/bin/pavucontrol"; + }; + + network = { + format-wifi = "󰖩 {essid}"; + on-click = "${pkgs.networkmanagerapplet}/bin/nm-connection-editor"; + format-ethernet = "󰈀 wired"; + format-disconnected = ""; + tooltip-format = "{ifname} via {gwaddr} "; + tooltip-format-wifi = "{essid} ({signalStrength}%) "; + tooltip-format-ethernet = "{ifname} "; + tooltip-format-disconnected = "Disconnected"; + }; + + clock = { + format = "󰃰 {:%d.%m.%y 󰇙 %H:%M}"; + }; + + "custom/icon" = { + format = " "; + # on-click = "${config.lily.wlogout.logoutlaunch}/bin/logoutlaunch"; + }; + + "custom/screenshot" = { + format = " "; + on-click = "GRIM_DEFAULT_DIR=${config.xdg.configHome}/../Pictures/Screenshots ${pkgs.grim}/bin/grim"; + }; + + "custom/separator" = { + format = " "; + }; + + "hyprland/workspaces" = { + format = "{icon}"; # lavender + tooltip = false; + all-outputs = false; + current-only = true; + sort-by-number = true; + persistent-workspaces = { + "1" = ""; + "2" = ""; + "3" = ""; + "4" = ""; + "5" = ""; + "6" = ""; + "7" = ""; + "8" = ""; + "9" = ""; + "10" = ""; + }; + format-icons = { + "1" = ""; + "2" = ""; + "3" = ""; + "4" = ""; + "5" = ""; + "6" = ""; + "7" = ""; + "8" = ""; + "9" = ""; + "10" = "󰊠"; # sapphire + urgent = ""; # sapphire + active = "󰮯"; # blue + default = ""; + }; + }; + + "hyprland/window" = { + format = "{}"; + rewrite = { + "" = "There is no place like ~"; + }; + max-length = 200; + seperate-outputs = true; + }; + }; + }; }; + # home.file.".config/waybar/themes/theme.css" = { source = ./themes/Catppuccin-Mocha.css; }; }; } diff --git a/home-manager/modules/waybar/default.nix.old b/home-manager/modules/waybar/default.nix.old new file mode 100644 index 0000000..e4bc891 --- /dev/null +++ b/home-manager/modules/waybar/default.nix.old @@ -0,0 +1,203 @@ +{ pkgs, config, lib, ... }: +let + cfg = config.lily.waybar; +in +{ + options.lily.waybar.enable = lib.mkEnableOption "activate waybar"; + config = lib.mkIf cfg.enable { + home.packages = with pkgs; [ + pavucontrol + networkmanagerapplet + blueman + ]; + programs.waybar = { + enable = true; + style = ./style.css; + + settings = { + mainBar = { + layer = "top"; + position = "top"; + mode = "dock"; + height = 40; + tray.icon-size = 15; + + modules-left = [ + "custom/icon" + "custom/separator" + "cpu" + "memory" + "temperature" + "battery" + "custom/separator" + "custom/separator" + "custom/screenshot" + "tray" + "hyprland/workspaces" + ]; + + modules-center = [ "hyprland/window" ]; + modules-right = [ + "mpris" + "pulseaudio" + "network" + "bluetooth" + "custom/wallchange" + "custom/themechange" + "clock" + ]; + + mpris = { + format = "{player_icon}{status_icon} [{position}/{length}] {title} - {artist}"; + tooltip-format = "{player_icon}{status_icon} [{position}/{length}] {title} - {artist}"; + title-len = 20; + artist-len = 10; + interval = 1; + player-icons = { + default = ""; + mpv = "🎵 "; + spotify = " "; + }; + status-icons = { + playing = "▶"; + stopped = "󰓛"; + paused = "󰏤"; + }; + on-click-middle = "playerctld shift"; + }; + + cpu = { + interval = 10; + format = " {usage}"; + max-length = 10; + }; + + memory = { + interval = 30; + format = " {used:0.1f}G"; + max-length = 10; + }; + + temperatures = { + thermal-zone = 0; + critical-threshold = 90; + format-critical = " {temperatureC}°C"; + format = " {temperatureC}°C"; + }; + + battery = { + interval = 30; + states = { + warning = 30; + critical = 15; + }; + format = "{icon} {capacity}%"; + format-charging = " {icon} {capacity}%"; + format-icons = [ " " " " " " " " ]; + max-length = 25; + }; + + pulseaudio = { + format = "{icon} {volume}"; + format-bluetooth = " "; + format-bluetooth-muted = " "; + format-muted = ""; + format-icons = { + default = [ "" "󰕾" "" ]; + }; + on-click = "${pkgs.pavucontrol}/bin/pavucontrol"; + }; + + network = { + format-wifi = "󰖩 {essid}"; + on-click = "${pkgs.networkmanagerapplet}/bin/nm-connection-editor"; + format-ethernet = "󰈀 wired"; + format-disconnected = ""; + tooltip-format = "{ifname} via {gwaddr} "; + tooltip-format-wifi = "{essid} ({signalStrength}%) "; + tooltip-format-ethernet = "{ifname} "; + tooltip-format-disconnected = "Disconnected"; + }; + + bluetooth = { + tooltip = true; + on-click = "${pkgs.blueman}/bin/blueman-manager"; + }; + + clock = { + format = "󰃰 {:%d.%m.%y 󰇙 %H:%M}"; + }; + + "custom/icon" = { + format = " "; + # on-click = "${config.lily.wlogout.logoutlaunch}/bin/logoutlaunch"; + }; + + "custom/screenshot" = { + format = " "; + on-click = "GRIM_DEFAULT_DIR=${config.xdg.configHome}/../Pictures/Screenshots ${pkgs.grim}/bin/grim"; + }; + + "custom/separator" = { + format = " "; + }; + + # "custom/wallchange" = { + # format = "󰉼 {}"; + # tooltip = true; + # exec = "echo ; echo 󰆊 switch wallpaper"; + # on-click = "${inputs.wall-utils.packages.${pkgs.system}.wall-utils}/bin/wall-utils next"; + # on-click-right = "${inputs.wall-utils.packages.${pkgs.system}.wall-utils}/bin/wall-utils previous"; + # on-click-middle = "${inputs.wall-utils.packages.${pkgs.system}.wall-utils}/bin/wall-utils select"; + # # interval = 3600; # once every day + # }; + + "hyprland/workspaces" = { + format = "{icon}"; # lavender + tooltip = false; + all-outputs = false; + current-only = true; + sort-by-number = true; + persistent-workspaces = { + "1" = ""; + "2" = ""; + "3" = ""; + "4" = ""; + "5" = ""; + "6" = ""; + "7" = ""; + "8" = ""; + "9" = ""; + "10" = ""; + }; + format-icons = { + "1" = ""; + "2" = ""; + "3" = ""; + "4" = ""; + "5" = ""; + "6" = ""; + "7" = ""; + "8" = ""; + "9" = ""; + "10" = "󰊠"; # sapphire + urgent = ""; # sapphire + active = "󰮯"; # blue + default = ""; + }; + }; + + "hyprland/window" = { + format = "{}"; + rewrite = { + "" = "There is no place like ~"; + }; + max-length = 200; + seperate-outputs = true; + }; + }; + }; + }; + home.file.".config/waybar/themes/theme.css" = { source = ./themes/Catppuccin-Mocha.css; }; + }; +} diff --git a/home-manager/modules/waybar/style.css b/home-manager/modules/waybar/style.css new file mode 100644 index 0000000..8e34242 --- /dev/null +++ b/home-manager/modules/waybar/style.css @@ -0,0 +1,108 @@ +* { + /* `otf-font-awesome` and SpaceMono Nerd Font are required to be installed for icons */ + font-family: "Fira Sans Semibold", FontAwesome, Roboto, Helvetica, Arial, sans-serif; + font-size: 15px; + transition: background-color .3s ease-out; +} + +window#waybar { + background: rgba(26, 27, 38, 0); + border: none; + color: #c0caf5; + font-family: + SpaceMono Nerd Font, + feather; + transition: background-color .5s; +} + +.modules-left, +.modules-center, +.modules-right +{ + background: rgba(0, 0, 8, 1); + margin: 5px 10px; + padding: 0 5px; + border-radius: 15px; +} +.modules-left { + padding: 0; +} +.modules-center { + padding: 0 10px; +} + +#clock, +#battery, +#cpu, +#memory, +#disk, +#temperature, +#backlight, +#network, +#pulseaudio, +#wireplumber, +#custom-media, +#tray, +#mode, +#idle_inhibitor, +#scratchpad, +#power-profiles-daemon, +#language, +#mpd { + padding: 0 10px; + border-radius: 15px; +} + +#clock:hover, +#battery:hover, +#cpu:hover, +#memory:hover, +#disk:hover, +#temperature:hover, +#backlight:hover, +#network:hover, +#pulseaudio:hover, +#wireplumber:hover, +#custom-media:hover, +#tray:hover, +#mode:hover, +#idle_inhibitor:hover, +#scratchpad:hover, +#power-profiles-daemon:hover, +#language:hover, +#mpd:hover { + background: rgba(26, 27, 38, 0.9); +} + + +#workspaces button { + background: transparent; + font-family: + SpaceMono Nerd Font, + feather; + font-weight: 900; + font-size: 13pt; + color: #c0caf5; + border:none; + border-radius: 15px; +} + +#workspaces button.active { + background: #13131d; +} + +#workspaces button:hover { + background: #11111b; + color: #cdd6f4; + box-shadow: none; +} + +#custom-arch { + margin-left: 5px; + padding: 0 10px; + font-size: 25px; + transition: color .5s; +} +#custom-arch:hover { + color: #1793d1; +} diff --git a/home-manager/modules/waybar/style.css.old b/home-manager/modules/waybar/style.css.old new file mode 100644 index 0000000..3df4eeb --- /dev/null +++ b/home-manager/modules/waybar/style.css.old @@ -0,0 +1,153 @@ +* { + border: none; + border-radius: 0px; + font-family: "Iosevka Nerd Font"; + font-weight: bold; + font-size: 13px; + min-height: 10px; +} + +@import "themes/theme.css"; + +window#waybar { + border-bottom: 1px solid rgba(255,255, 255, 0.2); + border-left: 1px solid rgba(255, 255, 255, 0.2); + border-right: 1px solid rgba(255, 255, 255, 0.2); + border-bottom-right-radius: 10px; + border-bottom-left-radius: 10px; + background: @bar-bg; +} + +tooltip { + background: @main-bg; + color: @main-fg; + border-radius: 7px; + border-width: 0px; +} + +#cpu, +#battery, +#memory, +#temperature { + padding-left: 10px; + padding-right: 10px; + background-color: @wb-act-fg; + margin: 1px 0px 1px 0px; +} + +#cpu { + border-radius: 10px 0px 0px 10px; + color: @maroon; +} + +#memory { + color: @peach; +} + +#temperature { + color: @yellow; +} + +#memory, +#temperature { + border-radius: 0px; +} + +#battery { + border-radius: 0px 10px 10px 0px; + color: @green; +} + +#tray { + color: @sky; +} + +#pulseaudio { + color: @rosewater; +} + +#mpris { + color: @rosewater; +} + +#network { + color: @flamingo; +} + +#bluetooth { + color: @pink; +} + +#custom-wallchange, +#custom-themechange { + color: @mauve; +} + +#clock { + color: @mauve; +} + +#bluetooth, +#clock, +#idle_inhibitor, +#language, +#mpris, +#network, +#pulseaudio, +#taskbar, +#tray, +#window, +#custom-icon, +#workspaces { + opacity: 1; + padding-left: 10px; + padding-right: 10px; + border-radius: 10px; +} + +.modules-left, +.modules-right, +.modules-center { + color: @main-fg; + background: @main-bg; + border-radius: 10px; + margin-left: 2px; + margin-right: 2px; + margin-top: 2px; + margin-bottom: 2px; +} + +#custom-icon { + color: @red; + font-weight: bold; +} + +#custom-apt-update-icon, +#custom-screenshot +{ + color: @teal; +} + +#workspaces { + color: @main-fg; + background: @main-bg; +} + +#workspaces button { + padding-left: 3px; + padding-right: 3px; + border-radius: 10px; + color: @main-fg; + transition: all 0.5s cubic-bezier(0.55, -0.68, 0.48, 1.682); +} + +#workspaces button.active { + background: @wb-act-fg; + color: @lavender; + margin-left: 3px; + padding-left: 12px; + margin-top: 2px; + margin-bottom: 2px; + padding-right: 12px; + margin-right: 3px; +} diff --git a/home-manager/modules/waybar/themes/Catppuccin-Latte.css b/home-manager/modules/waybar/themes/Catppuccin-Latte.css new file mode 100644 index 0000000..6e146db --- /dev/null +++ b/home-manager/modules/waybar/themes/Catppuccin-Latte.css @@ -0,0 +1,26 @@ +@define-color bar-bg rgba(0, 0, 0, 0); + + +@define-color main-bg #dce0e8; +@define-color main-fg #4c4f69; + +@define-color wb-act-bg #ccd0da; +@define-color wb-act-fg #bcc0cc; + +@define-color wb-hvr-bg #acb0be; +@define-color wb-hvr-fg #6cd0da; + +@define-color rosewater #dc8a78; +@define-color flamingo #dd7878; +@define-color pink #ea76cb; +@define-color mauve #8839ef; +@define-color red #d20f39; +@define-color maroon #e64553; +@define-color peach #fe640b; +@define-color yellow #df8e1d; +@define-color green #40a02b; +@define-color teal #179299; +@define-color sky #04a5e5; +@define-color sapphire #209fb5; +@define-color blue #1e66f5; +@define-color lavender #7287fd; diff --git a/home-manager/modules/waybar/themes/Catppuccin-Mocha.css b/home-manager/modules/waybar/themes/Catppuccin-Mocha.css new file mode 100644 index 0000000..078d8af --- /dev/null +++ b/home-manager/modules/waybar/themes/Catppuccin-Mocha.css @@ -0,0 +1,25 @@ +@define-color bar-bg rgba(0, 0, 0, 0); + +@define-color main-bg #11111b; +@define-color main-fg #cdd6f4; + +@define-color wb-act-bg #a6adc8; +@define-color wb-act-fg #313244; + +@define-color wb-hvr-bg #f5c2e7; +@define-color wb-hvr-fg #313244; + +@define-color rosewater #f5e0dc; +@define-color flamingo #f2cdcd; +@define-color pink #f5c2e7; +@define-color mauve #cba6f7; +@define-color red #f38ba8; +@define-color maroon #eba0ac; +@define-color peach #fab387; +@define-color yellow #f9e2af; +@define-color green #a6e3a1; +@define-color teal #94e2d5; +@define-color sky #89dceb; +@define-color sapphire #74c7ec; +@define-color blue #89b4fa; +@define-color lavender #b4befe; diff --git a/home-manager/modules/waybar/themes/theme.css b/home-manager/modules/waybar/themes/theme.css new file mode 100644 index 0000000..56f46af --- /dev/null +++ b/home-manager/modules/waybar/themes/theme.css @@ -0,0 +1,26 @@ +@define-color bar-bg rgba(0, 0, 0, 0); + + +@define-color main-bg #11111b; +@define-color main-fg #cdd6f4; + +@define-color wb-act-bg #a6adc8; +@define-color wb-act-fg #313244; + +@define-color wb-hvr-bg #f5c2e7; +@define-color wb-hvr-fg #313244; + +@define-color rosewater #f5e0dc; +@define-color flamingo #f2cdcd; +@define-color pink #f5c2e7; +@define-color mauve #cba6f7; +@define-color red #f38ba8; +@define-color maroon #eba0ac; +@define-color peach #fab387; +@define-color yellow #f9e2af; +@define-color green #a6e3a1; +@define-color teal #94e2d5; +@define-color sky #89dceb; +@define-color sapphire #74c7ec; +@define-color blue #89b4fa; +@define-color lavender #b4befe; diff --git a/home-manager/profiles/desktop.nix b/home-manager/profiles/desktop.nix index 3755a57..fb7aaaa 100644 --- a/home-manager/profiles/desktop.nix +++ b/home-manager/profiles/desktop.nix @@ -17,5 +17,11 @@ vesktop inputs.zen-browser.packages."${system}".default hyfetch + + nerd-fonts.iosevka + nerd-fonts.space-mono + fira-sans + + prismlauncher ]; } diff --git a/modules/common/desktop.nix b/modules/common/desktop.nix index 8d83f6d..bc5adc4 100644 --- a/modules/common/desktop.nix +++ b/modules/common/desktop.nix @@ -2,6 +2,7 @@ pkgs, lib, config, + inputs, flake-self, ... }: let @@ -29,6 +30,7 @@ in { envsubst glib headsetcontrol + flatpak ]; networking = { networkmanager.enable = true; @@ -68,7 +70,7 @@ in { }; # services.printing.enable = true; - # services.flatpak.enable = true; + services.flatpak.enable = true; services.avahi = { enable = true; nssmdns4 = true; @@ -78,5 +80,11 @@ in { # environment.sessionVariables = { # MOZ_DISABLE_RDD_SANDBOX = "1"; # }; + + programs.nix-ld.enable = true; + programs.nix-ld.libraries = with pkgs; [ + # Add any missing dynamic libraries for unpackaged programs + # here, NOT in environment.systemPackages + ]; }; } diff --git a/modules/wayland/default.nix b/modules/wayland/default.nix index c896cc9..68ed01a 100644 --- a/modules/wayland/default.nix +++ b/modules/wayland/default.nix @@ -13,7 +13,7 @@ in { [ wl-clipboard xwayland - xwaylandvideobridge + kdePackages.xwaylandvideobridge wayland-utils wev ] From 9d506aa2ec4e8fcc392a415805b4bff1159c21c2 Mon Sep 17 00:00:00 2001 From: lily Date: Sat, 5 Apr 2025 22:02:41 -0400 Subject: [PATCH 049/102] add: vscode config --- home-manager/modules/vscode/default.nix | 19 ++++++------------- home-manager/profiles/desktop.nix | 7 +++++++ 2 files changed, 13 insertions(+), 13 deletions(-) diff --git a/home-manager/modules/vscode/default.nix b/home-manager/modules/vscode/default.nix index 2c02cc2..637061e 100644 --- a/home-manager/modules/vscode/default.nix +++ b/home-manager/modules/vscode/default.nix @@ -15,7 +15,7 @@ in { enable = true; enableUpdateCheck = false; enableExtensionUpdateCheck = false; - mutableExtensionsDir = false; + mutableExtensionsDir = true; package = pkgs.vscode.overrideAttrs (attrs: { buildInputs = with pkgs; attrs.buildInputs @@ -27,6 +27,7 @@ in { ]; }); extensions = with pkgs.vscode-extensions; [ + github.github-vscode-theme github.copilot github.copilot-chat rust-lang.rust-analyzer @@ -42,8 +43,6 @@ in { bierner.markdown-footnotes bierner.markdown-mermaid denoland.vscode-deno - ziglang.vscode-zig - # geequlim.godot-tools gruntfuggly.todo-tree mhutchie.git-graph fill-labs.dependi @@ -52,21 +51,14 @@ in { twxs.cmake llvm-vs-code-extensions.vscode-clangd mkhl.direnv - (pkgs.vscode-utils.buildVscodeMarketplaceExtension { - mktplcRef = { - name = "darcula-solid"; - publisher = "jussiemion"; - version = "1.2.1"; - hash = "sha256-tIfCkOR1Z/uRWiZhrBfOQCZT3Cu6yNjAnxjn0UJFO2U="; - }; - }) + vscodevim.vim ]; userSettings = { "editor.cursorSmoothCaretAnimation" = "on"; "editor.smoothScrolling" = true; "editor.cursorBlinking" = "expand"; - "workbench.colorTheme" = "Darcula Solid"; + "workbench.colorTheme" = "GitHub Dark Default"; "clangd.path" = "${pkgs.clang-tools}/bin/clangd"; "clangd.arguments" = [ "--clang-tidy" @@ -77,7 +69,8 @@ in { "--all-scopes-completion" ]; "editor.fontFamily" = "JetBrainsMono Nerd Font"; - "zig.path" = "${pkgs.zls}/bin/zls"; + "workbench.activityBar.location" = "top"; + "window.menuBarVisibility" = "compact"; }; }; }; diff --git a/home-manager/profiles/desktop.nix b/home-manager/profiles/desktop.nix index fb7aaaa..028b65c 100644 --- a/home-manager/profiles/desktop.nix +++ b/home-manager/profiles/desktop.nix @@ -12,6 +12,7 @@ neovim.enable = true; rofi.enable = true; waybar.enable = true; + vscode.enable = true; }; home.packages = with pkgs; [ vesktop @@ -23,5 +24,11 @@ fira-sans prismlauncher + element-desktop + mission-center + + appimage-run + + r2modman ]; } From 21b8f144cbf2b85e7ffe4f0c912dd3c631c4778b Mon Sep 17 00:00:00 2001 From: lily Date: Sat, 5 Apr 2025 22:36:02 -0400 Subject: [PATCH 050/102] fix: broken xdg-desktop-portals --- home-manager/profiles/desktop.nix | 7 +++++++ modules/plasma/default.nix | 5 +++++ 2 files changed, 12 insertions(+) diff --git a/home-manager/profiles/desktop.nix b/home-manager/profiles/desktop.nix index 028b65c..767b539 100644 --- a/home-manager/profiles/desktop.nix +++ b/home-manager/profiles/desktop.nix @@ -31,4 +31,11 @@ r2modman ]; + + xdg.portal.enable = true; + xdg.portal.extraPortals = with pkgs; [ + kdePackages.xdg-desktop-portal-kde + xdg-desktop-portal-gtk + xdg-desktop-portal-hyprland + ]; } diff --git a/modules/plasma/default.nix b/modules/plasma/default.nix index 2939da2..aa51cb1 100644 --- a/modules/plasma/default.nix +++ b/modules/plasma/default.nix @@ -16,5 +16,10 @@ in { }; desktopManager.plasma6.enable = true; }; + + xdg.portal.enable = true; + xdg.portal.extraPortals = [ + pkgs.kdePackages.xdg-desktop-portal-kde + ]; }; } From cf10f6da5bcc6efcde1b5aebe4e704d78b20f438 Mon Sep 17 00:00:00 2001 From: lily Date: Mon, 7 Apr 2025 13:18:51 -0400 Subject: [PATCH 051/102] add(nixvim): neocord --- home-manager/modules/neovim/plugins/default.nix | 1 + home-manager/modules/neovim/plugins/neocord.nix | 6 ++++++ home-manager/profiles/desktop.nix | 5 +++++ 3 files changed, 12 insertions(+) create mode 100644 home-manager/modules/neovim/plugins/neocord.nix diff --git a/home-manager/modules/neovim/plugins/default.nix b/home-manager/modules/neovim/plugins/default.nix index 8031650..0383ae1 100644 --- a/home-manager/modules/neovim/plugins/default.nix +++ b/home-manager/modules/neovim/plugins/default.nix @@ -6,6 +6,7 @@ ./gitsigns.nix ./tree.nix ./lsp + ./neocord.nix # ./dap.nix ]; programs.nixvim.plugins = { diff --git a/home-manager/modules/neovim/plugins/neocord.nix b/home-manager/modules/neovim/plugins/neocord.nix new file mode 100644 index 0000000..71e42a4 --- /dev/null +++ b/home-manager/modules/neovim/plugins/neocord.nix @@ -0,0 +1,6 @@ +{...}: { + programs.nixvim.plugins.neocord.enable = true; + programs.nixvim.plugins.neocord.settings = { + show_line_number = true; + }; +} diff --git a/home-manager/profiles/desktop.nix b/home-manager/profiles/desktop.nix index 767b539..f988f56 100644 --- a/home-manager/profiles/desktop.nix +++ b/home-manager/profiles/desktop.nix @@ -38,4 +38,9 @@ xdg-desktop-portal-gtk xdg-desktop-portal-hyprland ]; + + home.sessionVariables = { + XCURSOR_THEME = "Breeze"; + XCURSOR_SIZE = "24"; + }; } From 0c2d3b2e7878f1833a3b23c5692a9600d47d251c Mon Sep 17 00:00:00 2001 From: lily Date: Wed, 24 Jul 2024 19:51:43 -0400 Subject: [PATCH 052/102] base: add existing config --- LICENSE | 19 +++++++++++ README.md | 3 ++ flake.lock | 48 +++++++++++++++++++++++++++ flake.nix | 28 ++++++++++++++++ home-manager/home.nix | 14 ++++++++ home-manager/packages/git.nix | 19 +++++++++++ home-manager/packages/packages.nix | 20 +++++++++++ home-manager/packages/zsh.nix | 26 +++++++++++++++ nixos/configuration.nix | 25 ++++++++++++++ nixos/environments/plasma-wayland.nix | 14 ++++++++ nixos/hardware/audio.nix | 5 +++ nixos/hardware/fstab.nix | 14 ++++++++ nixos/hardware/hardware.nix | 13 ++++++++ nixos/hardware/intel.nix | 6 ++++ nixos/hardware/modules.nix | 13 ++++++++ nixos/hardware/network.nix | 5 +++ nixos/hardware/nvidia.nix | 13 ++++++++ nixos/misc/locale.nix | 5 +++ nixos/misc/misc.nix | 10 ++++++ nixos/misc/nixconfig.nix | 6 ++++ nixos/misc/time.nix | 5 +++ nixos/programs/dconf.nix | 5 +++ nixos/programs/gpg.nix | 8 +++++ nixos/programs/nix-ld.nix | 8 +++++ nixos/programs/programs.nix | 29 ++++++++++++++++ nixos/programs/steam.nix | 5 +++ nixos/services/boot.nix | 9 +++++ nixos/services/cups.nix | 5 +++ nixos/services/firewall.nix | 7 ++++ nixos/services/libinput.nix | 5 +++ nixos/services/networkmanager.nix | 6 ++++ nixos/services/pipewire.nix | 11 ++++++ nixos/services/services.nix | 13 ++++++++ nixos/users/luxzi.nix | 15 +++++++++ 34 files changed, 437 insertions(+) create mode 100644 LICENSE create mode 100644 README.md create mode 100644 flake.lock create mode 100644 flake.nix create mode 100644 home-manager/home.nix create mode 100644 home-manager/packages/git.nix create mode 100644 home-manager/packages/packages.nix create mode 100644 home-manager/packages/zsh.nix create mode 100644 nixos/configuration.nix create mode 100644 nixos/environments/plasma-wayland.nix create mode 100644 nixos/hardware/audio.nix create mode 100644 nixos/hardware/fstab.nix create mode 100644 nixos/hardware/hardware.nix create mode 100644 nixos/hardware/intel.nix create mode 100644 nixos/hardware/modules.nix create mode 100644 nixos/hardware/network.nix create mode 100644 nixos/hardware/nvidia.nix create mode 100644 nixos/misc/locale.nix create mode 100644 nixos/misc/misc.nix create mode 100644 nixos/misc/nixconfig.nix create mode 100644 nixos/misc/time.nix create mode 100644 nixos/programs/dconf.nix create mode 100644 nixos/programs/gpg.nix create mode 100644 nixos/programs/nix-ld.nix create mode 100644 nixos/programs/programs.nix create mode 100644 nixos/programs/steam.nix create mode 100644 nixos/services/boot.nix create mode 100644 nixos/services/cups.nix create mode 100644 nixos/services/firewall.nix create mode 100644 nixos/services/libinput.nix create mode 100644 nixos/services/networkmanager.nix create mode 100644 nixos/services/pipewire.nix create mode 100644 nixos/services/services.nix create mode 100644 nixos/users/luxzi.nix diff --git a/LICENSE b/LICENSE new file mode 100644 index 0000000..93972a0 --- /dev/null +++ b/LICENSE @@ -0,0 +1,19 @@ +Copyright (c) 2024 Luxzi + +Permission is hereby granted, free of charge, to any person obtaining a copy +of this software and associated documentation files (the "Software"), to deal +in the Software without restriction, including without limitation the rights +to use, copy, modify, merge, publish, distribute, sublicense, and/or sell +copies of the Software, and to permit persons to whom the Software is +furnished to do so, subject to the following conditions: + +The above copyright notice and this permission notice shall be included in all +copies or substantial portions of the Software. + +THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE +AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER +LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, +OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE +SOFTWARE. diff --git a/README.md b/README.md new file mode 100644 index 0000000..3f1492b --- /dev/null +++ b/README.md @@ -0,0 +1,3 @@ +# NixOS configuration files + +Configured for KDE Plasma Wayland on Nvidia. diff --git a/flake.lock b/flake.lock new file mode 100644 index 0000000..7deb4a9 --- /dev/null +++ b/flake.lock @@ -0,0 +1,48 @@ +{ + "nodes": { + "home-manager": { + "inputs": { + "nixpkgs": [ + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1721804110, + "narHash": "sha256-i4jINRazBKPqlaS+qhlP+kV/UHEq3vs5itfpblqu4ZM=", + "owner": "nix-community", + "repo": "home-manager", + "rev": "af70fc502a15d7e1e4c5a4c4fc8e06c2ec561e0c", + "type": "github" + }, + "original": { + "owner": "nix-community", + "repo": "home-manager", + "type": "github" + } + }, + "nixpkgs": { + "locked": { + "lastModified": 1721562059, + "narHash": "sha256-Tybxt65eyOARf285hMHIJ2uul8SULjFZbT9ZaEeUnP8=", + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "68c9ed8bbed9dfce253cc91560bf9043297ef2fe", + "type": "github" + }, + "original": { + "owner": "NixOS", + "ref": "nixos-unstable", + "repo": "nixpkgs", + "type": "github" + } + }, + "root": { + "inputs": { + "home-manager": "home-manager", + "nixpkgs": "nixpkgs" + } + } + }, + "root": "root", + "version": 7 +} diff --git a/flake.nix b/flake.nix new file mode 100644 index 0000000..c55fea8 --- /dev/null +++ b/flake.nix @@ -0,0 +1,28 @@ +{ + description = "Luxzi's NixOS system configuration"; + + inputs = { + nixpkgs.url = "github:NixOS/nixpkgs/nixos-unstable"; + home-manager.url = "github:nix-community/home-manager"; + home-manager.inputs.nixpkgs.follows = "nixpkgs"; + }; + + outputs = { self, nixpkgs, home-manager, ... }: + let + lib = nixpkgs.lib; + pkgs = nixpkgs.legacyPackages."x86_64-linux"; + in { + nixosConfigurations = { + nixos = lib.nixosSystem { + specialArgs = { inherit self; }; + modules = [ ./nixos/configuration.nix ]; + }; + }; + homeConfigurations = { + luxzi = home-manager.lib.homeManagerConfiguration { + inherit pkgs; + modules = [ ./home-manager/home.nix ]; + }; + }; + }; +} diff --git a/home-manager/home.nix b/home-manager/home.nix new file mode 100644 index 0000000..1499e1c --- /dev/null +++ b/home-manager/home.nix @@ -0,0 +1,14 @@ +{ config, pkgs, ... }: + +{ + imports = + [ + ./packages/packages.nix + ]; + + programs.home-manager.enable = true; + + home.username = "luxzi"; + home.homeDirectory = "/home/luxzi"; + home.stateVersion = "24.05"; +} diff --git a/home-manager/packages/git.nix b/home-manager/packages/git.nix new file mode 100644 index 0000000..8a88dd9 --- /dev/null +++ b/home-manager/packages/git.nix @@ -0,0 +1,19 @@ +{ ... }: + +{ + programs.git = { + enable = true; + userName = "luxzi"; + userEmail = "lesson085@gmail.com"; + aliases = { + pf = "push --force"; + kl = "log --show-signature"; + }; + signing = { + key = "$HOME/.ssh/luxzi"; + }; + extraConfig = { + init.defaultBranch = "main"; + }; + }; +} diff --git a/home-manager/packages/packages.nix b/home-manager/packages/packages.nix new file mode 100644 index 0000000..e44efab --- /dev/null +++ b/home-manager/packages/packages.nix @@ -0,0 +1,20 @@ +{ pkgs, ... }: + +{ + imports = + [ + ./zsh.nix + ./git.nix + ]; + + home.packages = with pkgs; [ + rustup + hyfetch + nix-output-monitor + alvr + firefox + tree + vesktop + kitty + ]; +} diff --git a/home-manager/packages/zsh.nix b/home-manager/packages/zsh.nix new file mode 100644 index 0000000..c9455d0 --- /dev/null +++ b/home-manager/packages/zsh.nix @@ -0,0 +1,26 @@ +{ ... }: + +{ + programs.zsh = { + enable = true; + enableCompletion = true; + autosuggestion.enable = true; + syntaxHighlighting.enable = true; + oh-my-zsh = { + enable = true; + plugins = [ "git" ]; + theme = "af-magic"; + }; + shellAliases = { + hm-switch = "home-manager switch --flake $HOME/.dotfiles"; + nx-switch = "sudo nixos-rebuild switch --flake $HOME/.dotfiles"; + nx-boot = "sudo nixos-rebuild boot --flake $HOME/.dotfiles"; + nx-clean = "sudo nix-collect-garbage --delete-old && nix-collect-garbage --delete-old"; + hm-clean = "home-manager remove-generations"; + gl-switch = "sudo nixos-rebuild switch --flake $HOME/.dotfiles && home-manager switch --flake $HOME/.dotfiles"; + gl-clean = "sudo nix-collect-garbage --delete-old && nix-collect-garbage --delete-old && home-manager remove-generations"; + snv = "sudo -E nvim"; + sen = "sudo -E"; + }; + }; +} diff --git a/nixos/configuration.nix b/nixos/configuration.nix new file mode 100644 index 0000000..21c024e --- /dev/null +++ b/nixos/configuration.nix @@ -0,0 +1,25 @@ +{ config, lib, pkgs, self, ... }: + +{ + imports = + [ # Include the results of the hardware scan. + ./hardware/hardware.nix + ./environments/plasma-wayland.nix + ./users/luxzi.nix + ./services/services.nix + ./programs/programs.nix + ./misc/misc.nix + ]; + + # Copy the NixOS configuration file and link it from the resulting system + # (/run/current-system/configuration.nix). This is useful in case you + # accidentally delete configuration.nix. + # system.copySystemConfiguration = true; + + # This value does NOT affect the Nixpkgs version your packages and OS are pulled from, + # so changing it will NOT upgrade your system - see https://nixos.org/manual/nixos/stable/#sec-upgrading for how + # to actually do that. + # For more information, see `man configuration.nix` or https://nixos.org/manual/nixos/stable/options#opt-system.stateVersion . + system.stateVersion = "24.05"; # Did you read the comment? +} + diff --git a/nixos/environments/plasma-wayland.nix b/nixos/environments/plasma-wayland.nix new file mode 100644 index 0000000..fb77cf1 --- /dev/null +++ b/nixos/environments/plasma-wayland.nix @@ -0,0 +1,14 @@ +{ pkgs, ... }: + +{ + services.xserver.videoDrivers = ["nvidia"]; + + services.displayManager.sddm.enable = true; + services.displayManager.sddm.wayland.enable = true; + services.desktopManager.plasma6.enable = true; + + environment.plasma6.excludePackages = with pkgs; [ + plasma-browser-integration + konsole + ]; +} diff --git a/nixos/hardware/audio.nix b/nixos/hardware/audio.nix new file mode 100644 index 0000000..82ca1fa --- /dev/null +++ b/nixos/hardware/audio.nix @@ -0,0 +1,5 @@ +{ ... }: + +{ + hardware.pulseaudio.enable = false; +} diff --git a/nixos/hardware/fstab.nix b/nixos/hardware/fstab.nix new file mode 100644 index 0000000..321df02 --- /dev/null +++ b/nixos/hardware/fstab.nix @@ -0,0 +1,14 @@ +{ ... }: + +{ + fileSystems."/" = + { device = "/dev/disk/by-uuid/6f9a4486-8f14-468f-aecb-5e0df8af2309"; + fsType = "ext4"; + }; + + fileSystems."/boot" = + { device = "/dev/disk/by-uuid/4A4B-5B94"; + fsType = "vfat"; + options = [ "fmask=0022" "dmask=0022" ]; + }; +} diff --git a/nixos/hardware/hardware.nix b/nixos/hardware/hardware.nix new file mode 100644 index 0000000..c7cd0a6 --- /dev/null +++ b/nixos/hardware/hardware.nix @@ -0,0 +1,13 @@ +{ ... }: + +{ + imports = + [ + ./modules.nix + ./fstab.nix + ./audio.nix + ./network.nix + ./intel.nix + ./nvidia.nix + ]; +} diff --git a/nixos/hardware/intel.nix b/nixos/hardware/intel.nix new file mode 100644 index 0000000..88bf59e --- /dev/null +++ b/nixos/hardware/intel.nix @@ -0,0 +1,6 @@ +{ lib, config, ... }: + +{ + nixpkgs.hostPlatform = lib.mkDefault "x86_64-linux"; + hardware.cpu.intel.updateMicrocode = lib.mkDefault config.hardware.enableRedistributableFirmware; +} diff --git a/nixos/hardware/modules.nix b/nixos/hardware/modules.nix new file mode 100644 index 0000000..1593b53 --- /dev/null +++ b/nixos/hardware/modules.nix @@ -0,0 +1,13 @@ +{ modulesPath, ... }: + +{ + imports = + [ + (modulesPath + "/installer/scan/not-detected.nix") + ]; + + boot.initrd.availableKernelModules = [ "xhci_pci" "ahci" "nvme" "usbhid" "usb_storage" "sd_mod" ]; + boot.initrd.kernelModules = [ ]; + boot.kernelModules = [ "kvm-intel" ]; + boot.extraModulePackages = [ ]; +} diff --git a/nixos/hardware/network.nix b/nixos/hardware/network.nix new file mode 100644 index 0000000..45bc069 --- /dev/null +++ b/nixos/hardware/network.nix @@ -0,0 +1,5 @@ +{ lib, ... }: + +{ + networking.useDHCP = lib.mkDefault true; +} diff --git a/nixos/hardware/nvidia.nix b/nixos/hardware/nvidia.nix new file mode 100644 index 0000000..eb1abd6 --- /dev/null +++ b/nixos/hardware/nvidia.nix @@ -0,0 +1,13 @@ +{ config, ... }: + +{ + hardware.graphics.enable = true; + hardware.nvidia = { + modesetting.enable = true; + powerManagement.enable = false; + powerManagement.finegrained = false; + open = false; + nvidiaSettings = false; + package = config.boot.kernelPackages.nvidiaPackages.stable; + }; +} diff --git a/nixos/misc/locale.nix b/nixos/misc/locale.nix new file mode 100644 index 0000000..01de88c --- /dev/null +++ b/nixos/misc/locale.nix @@ -0,0 +1,5 @@ +{ ... }: + +{ + i18n.defaultLocale = "en_US.UTF-8"; +} diff --git a/nixos/misc/misc.nix b/nixos/misc/misc.nix new file mode 100644 index 0000000..0ff1eca --- /dev/null +++ b/nixos/misc/misc.nix @@ -0,0 +1,10 @@ +{ ... }: + +{ + imports = + [ + ./time.nix + ./locale.nix + ./nixconfig.nix + ]; +} diff --git a/nixos/misc/nixconfig.nix b/nixos/misc/nixconfig.nix new file mode 100644 index 0000000..88d2b4a --- /dev/null +++ b/nixos/misc/nixconfig.nix @@ -0,0 +1,6 @@ +{ ... }: + +{ + nix.settings.experimental-features = [ "nix-command" "flakes" ]; + nixpkgs.config.allowUnfree = true; +} diff --git a/nixos/misc/time.nix b/nixos/misc/time.nix new file mode 100644 index 0000000..edf3feb --- /dev/null +++ b/nixos/misc/time.nix @@ -0,0 +1,5 @@ +{ ... }: + +{ + time.timeZone = "America/New_York"; +} diff --git a/nixos/programs/dconf.nix b/nixos/programs/dconf.nix new file mode 100644 index 0000000..11c2c3b --- /dev/null +++ b/nixos/programs/dconf.nix @@ -0,0 +1,5 @@ +{ ... }: + +{ + programs.dconf.enable = true; +} diff --git a/nixos/programs/gpg.nix b/nixos/programs/gpg.nix new file mode 100644 index 0000000..0ade0fc --- /dev/null +++ b/nixos/programs/gpg.nix @@ -0,0 +1,8 @@ +{ ... }: + +{ + programs.gnupg.agent = { + enable = true; + enableSSHSupport = true; + }; +} diff --git a/nixos/programs/nix-ld.nix b/nixos/programs/nix-ld.nix new file mode 100644 index 0000000..d178e51 --- /dev/null +++ b/nixos/programs/nix-ld.nix @@ -0,0 +1,8 @@ +{ pkgs, ... }: + +{ + programs.nix-ld = { + enable = true; + libraries = with pkgs; []; + }; +} diff --git a/nixos/programs/programs.nix b/nixos/programs/programs.nix new file mode 100644 index 0000000..65c910f --- /dev/null +++ b/nixos/programs/programs.nix @@ -0,0 +1,29 @@ +{ pkgs, ... }: + +{ + imports = + [ + ./nix-ld.nix + ./dconf.nix + ./gpg.nix + ./steam.nix + ]; + + environment.systemPackages = with pkgs; [ + wget + curl + git + neovim + fira-code-nerdfont + cmake + ninja + libgcc + gnumake + topgrade + unzip + patchelf + wl-clipboard + jdk17 + jre8 + ]; +} diff --git a/nixos/programs/steam.nix b/nixos/programs/steam.nix new file mode 100644 index 0000000..3e50e04 --- /dev/null +++ b/nixos/programs/steam.nix @@ -0,0 +1,5 @@ +{ ... }: + +{ + programs.steam.enable = true; +} diff --git a/nixos/services/boot.nix b/nixos/services/boot.nix new file mode 100644 index 0000000..8e3bb56 --- /dev/null +++ b/nixos/services/boot.nix @@ -0,0 +1,9 @@ +{ ... }: + +{ + boot.loader.systemd-boot.enable = true; + boot.loader.systemd-boot.configurationLimit = 10; + boot.loader.systemd-boot.editor = false; + boot.loader.efi.efiSysMountPoint = "/boot"; + boot.loader.efi.canTouchEfiVariables = true; +} diff --git a/nixos/services/cups.nix b/nixos/services/cups.nix new file mode 100644 index 0000000..4610bde --- /dev/null +++ b/nixos/services/cups.nix @@ -0,0 +1,5 @@ +{ ... }: + +{ + services.printing.enable = true; +} diff --git a/nixos/services/firewall.nix b/nixos/services/firewall.nix new file mode 100644 index 0000000..54168e7 --- /dev/null +++ b/nixos/services/firewall.nix @@ -0,0 +1,7 @@ +{ ... }: + +{ + networking.firewall.enable = false; + networking.firewall.allowedTCPPorts = []; + networking.firewall.allowedUDPPorts = []; +} diff --git a/nixos/services/libinput.nix b/nixos/services/libinput.nix new file mode 100644 index 0000000..4640b6d --- /dev/null +++ b/nixos/services/libinput.nix @@ -0,0 +1,5 @@ +{ ... }: + +{ + services.libinput.enable = true; +} diff --git a/nixos/services/networkmanager.nix b/nixos/services/networkmanager.nix new file mode 100644 index 0000000..55ce0e4 --- /dev/null +++ b/nixos/services/networkmanager.nix @@ -0,0 +1,6 @@ +{ ... }: + +{ + networking.hostName = "nixos"; + networking.networkmanager.enable = true; +} diff --git a/nixos/services/pipewire.nix b/nixos/services/pipewire.nix new file mode 100644 index 0000000..dcba83f --- /dev/null +++ b/nixos/services/pipewire.nix @@ -0,0 +1,11 @@ +{ ... }: + +{ + services.pipewire = { + enable = true; + audio.enable = true; + pulse.enable = true; + alsa.enable = true; + alsa.support32Bit = true; + }; +} diff --git a/nixos/services/services.nix b/nixos/services/services.nix new file mode 100644 index 0000000..25567fb --- /dev/null +++ b/nixos/services/services.nix @@ -0,0 +1,13 @@ +{ ... }: + +{ + imports = + [ + ./boot.nix + ./pipewire.nix + ./cups.nix + ./firewall.nix + ./libinput.nix + ./networkmanager.nix + ]; +} diff --git a/nixos/users/luxzi.nix b/nixos/users/luxzi.nix new file mode 100644 index 0000000..587a5d3 --- /dev/null +++ b/nixos/users/luxzi.nix @@ -0,0 +1,15 @@ +{ self, pkgs, ... }: + +{ + users.users.luxzi = { + isNormalUser = true; + extraGroups = [ "wheel" ]; # Enable ‘sudo’ for the user. + shell = pkgs.zsh; + packages = [ + self.inputs.home-manager.packages.${pkgs.system}.home-manager + ]; + }; + + environment.shells = with pkgs; [ zsh ]; + programs.zsh.enable = true; +} From c21ae00750656f17390143bfe199ef21f645afaf Mon Sep 17 00:00:00 2001 From: lily Date: Wed, 24 Jul 2024 19:54:49 -0400 Subject: [PATCH 053/102] fix: git signature format --- home-manager/packages/git.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/home-manager/packages/git.nix b/home-manager/packages/git.nix index 8a88dd9..b7219a0 100644 --- a/home-manager/packages/git.nix +++ b/home-manager/packages/git.nix @@ -14,6 +14,7 @@ }; extraConfig = { init.defaultBranch = "main"; + gpg.format = "ssh"; }; }; } From b6153d7bcc564dbe7f700c1572504959c999abd6 Mon Sep 17 00:00:00 2001 From: lily Date: Wed, 24 Jul 2024 19:57:23 -0400 Subject: [PATCH 054/102] fix: enable git commit signing --- home-manager/packages/git.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/home-manager/packages/git.nix b/home-manager/packages/git.nix index b7219a0..e04a86c 100644 --- a/home-manager/packages/git.nix +++ b/home-manager/packages/git.nix @@ -10,7 +10,8 @@ kl = "log --show-signature"; }; signing = { - key = "$HOME/.ssh/luxzi"; + key = "/home/luxzi/.ssh/luxzi"; + signByDefault = true; }; extraConfig = { init.defaultBranch = "main"; From f579f3405d38216cb917b2b0e8ea0c6aad0c6031 Mon Sep 17 00:00:00 2001 From: lily Date: Wed, 24 Jul 2024 21:20:31 -0400 Subject: [PATCH 055/102] add: emacs --- home-manager/packages/emacs.nix | 8 ++++++++ 1 file changed, 8 insertions(+) create mode 100644 home-manager/packages/emacs.nix diff --git a/home-manager/packages/emacs.nix b/home-manager/packages/emacs.nix new file mode 100644 index 0000000..5ca3fe5 --- /dev/null +++ b/home-manager/packages/emacs.nix @@ -0,0 +1,8 @@ +{ ... }: + +{ + programs.emacs = { + enable = true; + package = pkgs.emacs; + }; +} From f0fcfa84c87a6a73187caefba499e768eec590f1 Mon Sep 17 00:00:00 2001 From: lily Date: Wed, 24 Jul 2024 21:21:29 -0400 Subject: [PATCH 056/102] fix: emacs --- home-manager/packages/packages.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/home-manager/packages/packages.nix b/home-manager/packages/packages.nix index e44efab..eeb7233 100644 --- a/home-manager/packages/packages.nix +++ b/home-manager/packages/packages.nix @@ -5,6 +5,7 @@ [ ./zsh.nix ./git.nix + ./emacs.nix ]; home.packages = with pkgs; [ From c6c7e5d04fb9c586e0e04bdbf06c525086fc77ea Mon Sep 17 00:00:00 2001 From: lily Date: Wed, 24 Jul 2024 21:23:50 -0400 Subject: [PATCH 057/102] fix(hm-pkgs): emacs --- home-manager/packages/emacs.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/home-manager/packages/emacs.nix b/home-manager/packages/emacs.nix index 5ca3fe5..865ce73 100644 --- a/home-manager/packages/emacs.nix +++ b/home-manager/packages/emacs.nix @@ -1,4 +1,4 @@ -{ ... }: +{ pkgs, ... }: { programs.emacs = { From 1b60e413deee3a53ea48ec70bf654810166c06d3 Mon Sep 17 00:00:00 2001 From: lily Date: Wed, 24 Jul 2024 22:58:20 -0400 Subject: [PATCH 058/102] add: python3 --- nixos/programs/programs.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/nixos/programs/programs.nix b/nixos/programs/programs.nix index 65c910f..dd340d8 100644 --- a/nixos/programs/programs.nix +++ b/nixos/programs/programs.nix @@ -25,5 +25,6 @@ wl-clipboard jdk17 jre8 + python3 ]; } From cf7b9b01720886fe79a55ef6a82e91b64a6e72d0 Mon Sep 17 00:00:00 2001 From: lily Date: Wed, 24 Jul 2024 23:11:36 -0400 Subject: [PATCH 059/102] add: clang-tools --- nixos/programs/programs.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/nixos/programs/programs.nix b/nixos/programs/programs.nix index dd340d8..43f8fcb 100644 --- a/nixos/programs/programs.nix +++ b/nixos/programs/programs.nix @@ -26,5 +26,6 @@ jdk17 jre8 python3 + clang-tools ]; } From fd63b34ac15a827b18b59db01f07ffb4b603980d Mon Sep 17 00:00:00 2001 From: lily Date: Wed, 24 Jul 2024 23:30:43 -0400 Subject: [PATCH 060/102] add: clang --- nixos/programs/programs.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/nixos/programs/programs.nix b/nixos/programs/programs.nix index 43f8fcb..55e5c7b 100644 --- a/nixos/programs/programs.nix +++ b/nixos/programs/programs.nix @@ -27,5 +27,6 @@ jre8 python3 clang-tools + clang ]; } From dd947fda0b742b87717b371079bdd869872e07e5 Mon Sep 17 00:00:00 2001 From: lily Date: Thu, 25 Jul 2024 13:08:25 -0400 Subject: [PATCH 061/102] add: prismlauncher --- home-manager/packages/packages.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/home-manager/packages/packages.nix b/home-manager/packages/packages.nix index eeb7233..023e600 100644 --- a/home-manager/packages/packages.nix +++ b/home-manager/packages/packages.nix @@ -17,5 +17,6 @@ tree vesktop kitty + prismlauncher ]; } From f802f641aeedf46d1a859544fbc057d99d375178 Mon Sep 17 00:00:00 2001 From: lily Date: Thu, 25 Jul 2024 18:58:28 -0400 Subject: [PATCH 062/102] update: README.md --- README.md | 42 ++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 42 insertions(+) diff --git a/README.md b/README.md index 3f1492b..677a68e 100644 --- a/README.md +++ b/README.md @@ -1,3 +1,45 @@ # NixOS configuration files Configured for KDE Plasma Wayland on Nvidia. + +## Customizing user settings + +To change your username or any additional user settings, you must: + +- Create `./nixos/users/.nix`, this can be copied from `luxzi.nix` in the same directory. +- Import the newly created file in './nixos/configuration.nix'. +- Edit `./home-manager/home.nix` to the corresponding username and home directory. + +## Adjusting hardware configuration + +--- + +**NOTE** + +If you use an older Nvidia graphics card, you do not need to modify `./nixos/hardware/nvidia.nix`. +Although if you use a newer Nvidia graphics card, it is advised to enable `open` to use the open-source kernel driver. + +To use AMD graphics cards: + +- Create `./nixos/hardware/amd.nix` +- Add `services.xserver.videoDrivers = [ "amdgpu" ];` + +--- + +## Deployment + +If you would like to use these configuration files as is, you can install a NixOS system by: + +- Mount and format desired filesystems (as described in the NixOS manual). +- Run the following git clone command while also making sure to replace `` with your desired username: +``` sh +git clone git@codeberg.org:luxzi/nixos /mnt/home//.dotfiles +``` +- Make any desired changes. +- Install the system with the command below, again, making sure to replace `` with your desired username: +``` sh +nixos-install --flake /mnt/home//.dotfiles +``` + +For more modified versions of this configuration, I recommend forking this repository. + From 96c6ae224e3e3f0b8a2a54a3a2f586989fdd655d Mon Sep 17 00:00:00 2001 From: lily Date: Thu, 25 Jul 2024 19:03:28 -0400 Subject: [PATCH 063/102] update: README.md note --- README.md | 13 ++++--------- 1 file changed, 4 insertions(+), 9 deletions(-) diff --git a/README.md b/README.md index 677a68e..d96a2b2 100644 --- a/README.md +++ b/README.md @@ -7,25 +7,20 @@ Configured for KDE Plasma Wayland on Nvidia. To change your username or any additional user settings, you must: - Create `./nixos/users/.nix`, this can be copied from `luxzi.nix` in the same directory. -- Import the newly created file in './nixos/configuration.nix'. +- Import the newly created file in `./nixos/configuration.nix`. - Edit `./home-manager/home.nix` to the corresponding username and home directory. ## Adjusting hardware configuration ---- - -**NOTE** - -If you use an older Nvidia graphics card, you do not need to modify `./nixos/hardware/nvidia.nix`. -Although if you use a newer Nvidia graphics card, it is advised to enable `open` to use the open-source kernel driver. +> [!NOTE] +> If you use an older Nvidia graphics card (i.e. before RTX 20 series), you do not need to modify `./nixos/hardware/nvidia.nix`. +> Although if you use a newer Nvidia graphics card, it is advised to enable `open` to use the open-source kernel driver. To use AMD graphics cards: - Create `./nixos/hardware/amd.nix` - Add `services.xserver.videoDrivers = [ "amdgpu" ];` ---- - ## Deployment If you would like to use these configuration files as is, you can install a NixOS system by: From 251eea77f9ec510160a54e0ce7b0f4d6b0c8d01f Mon Sep 17 00:00:00 2001 From: lily Date: Thu, 25 Jul 2024 19:06:43 -0400 Subject: [PATCH 064/102] fix: README.md grammar mistakes --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index d96a2b2..2e54a8a 100644 --- a/README.md +++ b/README.md @@ -23,7 +23,7 @@ To use AMD graphics cards: ## Deployment -If you would like to use these configuration files as is, you can install a NixOS system by: +If you would like to use these configuration files as is: - Mount and format desired filesystems (as described in the NixOS manual). - Run the following git clone command while also making sure to replace `` with your desired username: From 8246fdbc0285c965052cc1ce0e549f81e732b016 Mon Sep 17 00:00:00 2001 From: lily Date: Fri, 26 Jul 2024 16:13:05 -0400 Subject: [PATCH 065/102] add: zplug --- home-manager/packages/packages.nix | 2 ++ home-manager/packages/zsh.nix | 41 ++++++++++++++++++++++++++---- 2 files changed, 38 insertions(+), 5 deletions(-) diff --git a/home-manager/packages/packages.nix b/home-manager/packages/packages.nix index 023e600..930f836 100644 --- a/home-manager/packages/packages.nix +++ b/home-manager/packages/packages.nix @@ -18,5 +18,7 @@ vesktop kitty prismlauncher + fzf + zoxide ]; } diff --git a/home-manager/packages/zsh.nix b/home-manager/packages/zsh.nix index c9455d0..8034166 100644 --- a/home-manager/packages/zsh.nix +++ b/home-manager/packages/zsh.nix @@ -6,11 +6,7 @@ enableCompletion = true; autosuggestion.enable = true; syntaxHighlighting.enable = true; - oh-my-zsh = { - enable = true; - plugins = [ "git" ]; - theme = "af-magic"; - }; + autocd = true; shellAliases = { hm-switch = "home-manager switch --flake $HOME/.dotfiles"; nx-switch = "sudo nixos-rebuild switch --flake $HOME/.dotfiles"; @@ -22,5 +18,40 @@ snv = "sudo -E nvim"; sen = "sudo -E"; }; + + zplug = { + enable = true; + plugins = [ + { name = "Aloxaf/fzf-tab"; } + ]; + }; + + history = { + size = 5000; + save = 5000; + ignoreAllDups = true; + ignoreDups = true; + ignoreSpace = true; + share = true; + }; + + initExtra = '' + bindkey -v + bindkey '^k' history-search-backward + bindkey '^j' history-search-forward + setopt appendHistory + zstyle ':completion:*' matcher-list 'm:{a-z}={A-Za-z}' + zstyle ':completion:*' menu no + zstyle ':fzf-tab:complete:cd:*' fzf-preview 'ls --color $realpath' + zstyle ':fzf-tab:complete:__zoxide_z:*' fzf-preview 'ls --color $realpath' + eval "$(fzf --zsh)" + eval "$(zoxide init --cmd cd zsh)" + ''; + }; + + programs.oh-my-posh = { + enable = true; + enableZshIntegration = true; + useTheme = "catppuccin_mocha"; }; } From 7f82330be566686fd67c574ecb0c495a96dbf7ab Mon Sep 17 00:00:00 2001 From: lily Date: Fri, 26 Jul 2024 17:39:20 -0400 Subject: [PATCH 066/102] conf: kitty --- home-manager/packages/kitty.nix | 11 ++++ home-manager/packages/packages.nix | 2 +- home-manager/packages/zsh.nix | 92 +++++++++++++++++++++++++++++- 3 files changed, 102 insertions(+), 3 deletions(-) create mode 100644 home-manager/packages/kitty.nix diff --git a/home-manager/packages/kitty.nix b/home-manager/packages/kitty.nix new file mode 100644 index 0000000..1af2a15 --- /dev/null +++ b/home-manager/packages/kitty.nix @@ -0,0 +1,11 @@ +{ ... }: + +{ + programs.kitty = { + enable = true; + font = "FiraCode Nerd Font"; + settings = { + window_padding_width = 4; + }; + }; +} diff --git a/home-manager/packages/packages.nix b/home-manager/packages/packages.nix index 930f836..8d0c2bd 100644 --- a/home-manager/packages/packages.nix +++ b/home-manager/packages/packages.nix @@ -6,6 +6,7 @@ ./zsh.nix ./git.nix ./emacs.nix + ./kitty.nix ]; home.packages = with pkgs; [ @@ -16,7 +17,6 @@ firefox tree vesktop - kitty prismlauncher fzf zoxide diff --git a/home-manager/packages/zsh.nix b/home-manager/packages/zsh.nix index 8034166..03d3bba 100644 --- a/home-manager/packages/zsh.nix +++ b/home-manager/packages/zsh.nix @@ -52,6 +52,94 @@ programs.oh-my-posh = { enable = true; enableZshIntegration = true; - useTheme = "catppuccin_mocha"; - }; + # useTheme = "catppuccin_mocha"; + settings = { + "$schema" = "https://raw.githubusercontent.com/JanDeDobbeleer/oh-my-posh/main/themes/schema.json"; + palette = { + os = "#ACB0BE"; + pink = "#F5BDE6"; + lavender = "#B7BDF8"; + blue = "#8AADF4"; + white = "#FFFFFF"; + text = "#494D64"; + }; + blocks = [ + { + alignment = "left"; + segments = [ + { + background = "p:blue"; + foreground = "p:wight"; + powerline_symbol = builtins.fromJSON '' "\ue0b4" ''; + leading_diamond = builtins.fromJSON '' "\ue0b6" ''; + style = "diamond"; + template = "{{.Icon}} "; + type = "os"; + } + { + background = "p:blue"; + foreground = "p:text"; + powerline_symbol = builtins.fromJSON '' "\ue0b4" ''; + style = "diamond"; + template = "{{ .UserName }}@{{ .HostName }}"; + type = "session"; + } + { + background = "p:pink"; + foreground = "p:text"; + properties = { + folder_icon = "..\ue5fe.."; + home_icon = "~"; + style = "folder"; + }; + powerline_symbol = builtins.fromJSON '' "\ue0b4" ''; + style = "powerline"; + template = builtins.fromJSON '' " \udb81\udf70 {{ .Path }}" ''; + type = "path"; + } + { + background = "p:blue"; + foreground = "p:text"; + powerline_symbol = builtins.fromJSON '' "\ue0b4" ''; + template = builtins.fromJSON '' "{{if .Env.IN_NIX_SHELL}} \uf313 in nix-shell{{else}}{{end}}" ''; + style = "diamond"; + type = "text"; + } + { + background = "p:lavender"; + foreground = "p:text"; + style = "powerline"; + properties = { + branch_icon = builtins.fromJSON '' "\ue725 " ''; + cherry_pick_icon = builtins.fromJSON '' "\ue29b " ''; + commit_icon = builtins.fromJSON '' "\uf417 " ''; + fetch_status = true; + fetch_upstream_icon = true; + fetch_bare_info = true; + merge_icon = builtins.fromJSON '' "\ue727 " ''; + no_commits_icon = builtins.fromJSON '' "\uf0c3 " ''; + rebase_icon = builtins.fromJSON '' "\ue728 " ''; + revert_icon = builtins.fromJSON '' "\uf0e2 " ''; + tag_icon = builtins.fromJSON '' "\uf412 " ''; + }; + powerline_symbol = builtins.fromJSON '' "\ue0b4" ''; + template = " {{ .HEAD }}{{ .Working }}"; + type = "git"; + } + { + background = "#f38ba8"; + foreground = "p:text"; + powerline_symbol = builtins.fromJSON '' "\ue0b4" ''; + template = builtins.fromJSON '' "{{if eq .Code 0}}{{else}} \uea87 {{.Code}}<#f38ba8,transparent>\ue0b4{{end}}" ''; + type = "status"; + style = "diamond"; + } + ]; + type = "prompt"; + } + ]; + final_space = true; + version = 2; + }; + }; } From ba36254d3de8de2453bdee6d0642ad272a11872a Mon Sep 17 00:00:00 2001 From: lily Date: Fri, 26 Jul 2024 18:10:34 -0400 Subject: [PATCH 067/102] conf: zsh --- home-manager/packages/git.nix | 1 + home-manager/packages/kitty.nix | 9 +++++++-- home-manager/packages/zsh.nix | 5 +++-- 3 files changed, 11 insertions(+), 4 deletions(-) diff --git a/home-manager/packages/git.nix b/home-manager/packages/git.nix index e04a86c..443166f 100644 --- a/home-manager/packages/git.nix +++ b/home-manager/packages/git.nix @@ -16,6 +16,7 @@ extraConfig = { init.defaultBranch = "main"; gpg.format = "ssh"; + core.symlinks = true; }; }; } diff --git a/home-manager/packages/kitty.nix b/home-manager/packages/kitty.nix index 1af2a15..cb0d531 100644 --- a/home-manager/packages/kitty.nix +++ b/home-manager/packages/kitty.nix @@ -1,9 +1,14 @@ -{ ... }: +{ pkgs, ... }: { programs.kitty = { enable = true; - font = "FiraCode Nerd Font"; + theme = "Catppuccin-Mocha"; + font = { + name = "FiraCode Nerd Font"; + package = pkgs.fira-code-nerdfont; + size = 14; + }; settings = { window_padding_width = 4; }; diff --git a/home-manager/packages/zsh.nix b/home-manager/packages/zsh.nix index 03d3bba..8024214 100644 --- a/home-manager/packages/zsh.nix +++ b/home-manager/packages/zsh.nix @@ -52,7 +52,6 @@ programs.oh-my-posh = { enable = true; enableZshIntegration = true; - # useTheme = "catppuccin_mocha"; settings = { "$schema" = "https://raw.githubusercontent.com/JanDeDobbeleer/oh-my-posh/main/themes/schema.json"; palette = { @@ -63,13 +62,15 @@ white = "#FFFFFF"; text = "#494D64"; }; + console_title_template = "{{.Folder}}{{if .Root}} :: root{{end}} :: {{.Shell}}"; blocks = [ { alignment = "left"; + newline = true; segments = [ { background = "p:blue"; - foreground = "p:wight"; + foreground = "p:white"; powerline_symbol = builtins.fromJSON '' "\ue0b4" ''; leading_diamond = builtins.fromJSON '' "\ue0b6" ''; style = "diamond"; From 239a2989d7d611030a2d6f657e4ab74d136f0ea7 Mon Sep 17 00:00:00 2001 From: lily Date: Fri, 26 Jul 2024 18:55:27 -0400 Subject: [PATCH 068/102] conf: doom-emacs --- .gitmodules | 3 + .../packages/doom-emacs/.doom.d/config.el | 100 +++++++++ .../packages/doom-emacs/.doom.d/custom.el | 13 ++ .../packages/doom-emacs/.doom.d/init.el | 191 ++++++++++++++++++ .../packages/doom-emacs/.doom.d/packages.el | 53 +++++ home-manager/packages/doom-emacs/.emacs.d | 1 + home-manager/packages/doom-emacs/.gitignore | 2 + home-manager/packages/emacs.nix | 5 + 8 files changed, 368 insertions(+) create mode 100644 .gitmodules create mode 100644 home-manager/packages/doom-emacs/.doom.d/config.el create mode 100644 home-manager/packages/doom-emacs/.doom.d/custom.el create mode 100644 home-manager/packages/doom-emacs/.doom.d/init.el create mode 100644 home-manager/packages/doom-emacs/.doom.d/packages.el create mode 160000 home-manager/packages/doom-emacs/.emacs.d create mode 100644 home-manager/packages/doom-emacs/.gitignore diff --git a/.gitmodules b/.gitmodules new file mode 100644 index 0000000..78080c7 --- /dev/null +++ b/.gitmodules @@ -0,0 +1,3 @@ +[submodule "home-manager/packages/doom-emacs/.emacs.d"] + path = home-manager/packages/doom-emacs/.emacs.d + url = https://github.com/doomemacs/doomemacs diff --git a/home-manager/packages/doom-emacs/.doom.d/config.el b/home-manager/packages/doom-emacs/.doom.d/config.el new file mode 100644 index 0000000..4c986e7 --- /dev/null +++ b/home-manager/packages/doom-emacs/.doom.d/config.el @@ -0,0 +1,100 @@ +;;; $DOOMDIR/config.el -*- lexical-binding: t; -*- + +;; Place your private configuration here! Remember, you do not need to run 'doom +;; sync' after modifying this file! + + +;; Some functionality uses this to identify you, e.g. GPG configuration, email +;; clients, file templates and snippets. It is optional. +;; (setq user-full-name "John Doe" +;; user-mail-address "john@doe.com") + +;; Doom exposes five (optional) variables for controlling fonts in Doom: +;; +;; - `doom-font' -- the primary font to use +;; - `doom-variable-pitch-font' -- a non-monospace font (where applicable) +;; - `doom-big-font' -- used for `doom-big-font-mode'; use this for +;; presentations or streaming. +;; - `doom-symbol-font' -- for symbols +;; - `doom-serif-font' -- for the `fixed-pitch-serif' face +;; +;; See 'C-h v doom-font' for documentation and more examples of what they +;; accept. For example: +;; +(setq doom-font (font-spec :family "FiraCode Nerd Font" :size 12 :weight 'semi-light) + doom-variable-pitch-font (font-spec :family "Liberation Sans" :size 13)) +;; +;; If you or Emacs can't find your font, use 'M-x describe-font' to look them +;; up, `M-x eval-region' to execute elisp code, and 'M-x doom/reload-font' to +;; refresh your font settings. If Emacs still can't find your font, it likely +;; wasn't installed correctly. Font issues are rarely Doom issues! + +;; There are two ways to load a theme. Both assume the theme is installed and +;; available. You can either set `doom-theme' or manually load a theme with the +;; `load-theme' function. This is the default: +(setq doom-theme 'catppuccin) + +;; This determines the style of line numbers in effect. If set to `nil', line +;; numbers are disabled. For relative line numbers, set this to `relative'. +(setq display-line-numbers-type 'relative) + +;; Modeline config +(setq doom-modeline-height 28) +(setq doom-modeline-modal t) +(setq doom-modeline-modal-icon t) +(setq doom-modeline-modal-modern-icon nil) +(setq doom-modeline-enable-word-count nil) +(setq doom-modeline-total-line-number t) +(setq doom-modeline-buffer-file-name-style 'truncate-with-project) +(setq doom-modeline-persp-name t) +(setq doom-modeline-persp-icon t) +(setq doom-modeline-major-mode-icon t) +(setq doom-modeline-major-mode-color-icon t) +(setq doom-modeline-buffer-state-icon t) +(setq doom-modeline-buffer-modification-icon t) +(setq doom-modeline-lsp-icon t) +(setq doom-modeline-always-show-macro-register t) +(setq doom-modeline-time t) +(setq doom-modeline-time-icon t) + +;; If you use `org' and don't want your org files in the default location below, +;; change `org-directory'. It must be set before org loads! +(setq org-directory "~/org/") + +(setq pixel-scroll-precision-large-scroll-height 40) +(setq pixel-scroll-precision-mode 1) +(setq catppuccin-flavor 'mocha) + +(setq evil-want-integration t) + +;; Whenever you reconfigure a package, make sure to wrap your config in an +;; `after!' block, otherwise Doom's defaults may override your settings. E.g. +;; +;; (after! PACKAGE +;; (setq x y)) +;; +;; The exceptions to this rule: +;; +;; - Setting file/directory variables (like `org-directory') +;; - Setting variables which explicitly tell you to set them before their +;; package is loaded (see 'C-h v VARIABLE' to look up their documentation). +;; - Setting doom variables (which start with 'doom-' or '+'). +;; +;; Here are some additional functions/macros that will help you configure Doom. +;; +;; - `load!' for loading external *.el files relative to this one +;; - `use-package!' for configuring packages +;; - `after!' for running code after a package has loaded +;; - `add-load-path!' for adding directories to the `load-path', relative to +;; this file. Emacs searches the `load-path' when you load packages with +;; `require' or `use-package'. +;; - `map!' for binding new keys +;; +;; To get information about any of these functions/macros, move the cursor over +;; the highlighted symbol at press 'K' (non-evil users must press 'C-c c k'). +;; This will open documentation for it, including demos of how they are used. +;; Alternatively, use `C-h o' to look up a symbol (functions, variables, faces, +;; etc). +;; +;; You can also try 'gd' (or 'C-c c d') to jump to their definition and see how +;; they are implemented. diff --git a/home-manager/packages/doom-emacs/.doom.d/custom.el b/home-manager/packages/doom-emacs/.doom.d/custom.el new file mode 100644 index 0000000..28486aa --- /dev/null +++ b/home-manager/packages/doom-emacs/.doom.d/custom.el @@ -0,0 +1,13 @@ +(custom-set-variables + ;; custom-set-variables was added by Custom. + ;; If you edit it by hand, you could mess it up, so be careful. + ;; Your init file should contain only one such instance. + ;; If there is more than one, they won't work right. + '(custom-safe-themes + '("4825b816a58680d1da5665f8776234d4aefce7908594bea75ec9d7e3dc429753" "8d3ef5ff6273f2a552152c7febc40eabca26bae05bd12bc85062e2dc224cde9a" "da75eceab6bea9298e04ce5b4b07349f8c02da305734f7c0c8c6af7b5eaa9738" "014cb63097fc7dbda3edf53eb09802237961cbb4c9e9abd705f23b86511b0a69" "d481904809c509641a1a1f1b1eb80b94c58c210145effc2631c1a7f2e4a2fdf4" "77fff78cc13a2ff41ad0a8ba2f09e8efd3c7e16be20725606c095f9a19c24d3d" "aec7b55f2a13307a55517fdf08438863d694550565dee23181d2ebd973ebd6b8" default))) +(custom-set-faces + ;; custom-set-faces was added by Custom. + ;; If you edit it by hand, you could mess it up, so be careful. + ;; Your init file should contain only one such instance. + ;; If there is more than one, they won't work right. + ) diff --git a/home-manager/packages/doom-emacs/.doom.d/init.el b/home-manager/packages/doom-emacs/.doom.d/init.el new file mode 100644 index 0000000..1d0a92e --- /dev/null +++ b/home-manager/packages/doom-emacs/.doom.d/init.el @@ -0,0 +1,191 @@ +;;; init.el -*- lexical-binding: t; -*- + +;; This file controls what Doom modules are enabled and what order they load +;; in. Remember to run 'doom sync' after modifying it! + +;; NOTE Press 'SPC h d h' (or 'C-h d h' for non-vim users) to access Doom's +;; documentation. There you'll find a link to Doom's Module Index where all +;; of our modules are listed, including what flags they support. + +;; NOTE Move your cursor over a module's name (or its flags) and press 'K' (or +;; 'C-c c k' for non-vim users) to view its documentation. This works on +;; flags as well (those symbols that start with a plus). +;; +;; Alternatively, press 'gd' (or 'C-c c d') on a module to browse its +;; directory (for easy access to its source code). + +(doom! :input + ;;bidi ; (tfel ot) thgir etirw uoy gnipleh + ;;chinese + ;;japanese + ;;layout ; auie,ctsrnm is the superior home row + + :completion + company ; the ultimate code completion backend + ;;(corfu +orderless) ; complete with cap(f), cape and a flying feather! + ;;helm ; the *other* search engine for love and life + ;;ido ; the other *other* search engine... + ;;ivy ; a search engine for love and life + vertico ; the search engine of the future + + :ui + ;;deft ; notational velocity for Emacs + doom ; what makes DOOM look the way it does + doom-dashboard ; a nifty splash screen for Emacs + ;;doom-quit ; DOOM quit-message prompts when you quit Emacs + ;;(emoji +unicode) ; 🙂 + hl-todo ; highlight TODO/FIXME/NOTE/DEPRECATED/HACK/REVIEW + ;;indent-guides ; highlighted indent columns + ;;ligatures ; ligatures and symbols to make your code pretty again + ;;minimap ; show a map of the code on the side + modeline ; snazzy, Atom-inspired modeline, plus API + ;;nav-flash ; blink cursor line after big motions + ;;neotree ; a project drawer, like NERDTree for vim + ophints ; highlight the region an operation acts on + (popup +defaults) ; tame sudden yet inevitable temporary windows + ;;tabs ; a tab bar for Emacs + treemacs ; a project drawer, like neotree but cooler + ;;unicode ; extended unicode support for various languages + (vc-gutter +pretty) ; vcs diff in the fringe + ;;vi-tilde-fringe ; fringe tildes to mark beyond EOB + ;;window-select ; visually switch windows + workspaces ; tab emulation, persistence & separate workspaces + ;;zen ; distraction-free coding or writing + + :editor + (evil +everywhere); come to the dark side, we have cookies + file-templates ; auto-snippets for empty files + fold ; (nigh) universal code folding + ;;(format +onsave) ; automated prettiness + ;;god ; run Emacs commands without modifier keys + ;;lispy ; vim for lisp, for people who don't like vim + ;;multiple-cursors ; editing in many places at once + ;;objed ; text object editing for the innocent + ;;parinfer ; turn lisp into python, sort of + ;;rotate-text ; cycle region at point between text candidates + snippets ; my elves. They type so I don't have to + word-wrap ; soft wrapping with language-aware indent + + :emacs + dired ; making dired pretty [functional] + electric ; smarter, keyword-based electric-indent + ;;ibuffer ; interactive buffer management + undo ; persistent, smarter undo for your inevitable mistakes + vc ; version-control and Emacs, sitting in a tree + + :term + ;;eshell ; the elisp shell that works everywhere + ;;shell ; simple shell REPL for Emacs + term ; basic terminal emulator for Emacs + ;;vterm ; the best terminal emulation in Emacs + + :checkers + syntax ; tasing you for every semicolon you forget + ;;(spell +flyspell) ; tasing you for misspelling mispelling + ;;grammar ; tasing grammar mistake every you make + + :tools + ;;ansible + ;;biblio ; Writes a PhD for you (citation needed) + ;;collab ; buffers with friends + ;;debugger ; FIXME stepping through code, to help you add bugs + ;;direnv + ;;docker + ;;editorconfig ; let someone else argue about tabs vs spaces + ;;ein ; tame Jupyter notebooks with emacs + (eval +overlay) ; run code, run (also, repls) + lookup ; navigate your code and its documentation + ;;lsp ; M-x vscode + magit ; a git porcelain for Emacs + ;;make ; run make tasks from Emacs + ;;pass ; password manager for nerds + ;;pdf ; pdf enhancements + ;;prodigy ; FIXME managing external services & code builders + ;;terraform ; infrastructure as code + ;;tmux ; an API for interacting with tmux + ;;tree-sitter ; syntax and parsing, sitting in a tree... + ;;upload ; map local to remote projects via ssh/ftp + + :os + (:if (featurep :system 'macos) macos) ; improve compatibility with macOS + ;;tty ; improve the terminal Emacs experience + + :lang + ;;agda ; types of types of types of types... + ;;beancount ; mind the GAAP + (cc +lsp) ; C > C++ == 1 + ;;clojure ; java with a lisp + ;;common-lisp ; if you've seen one lisp, you've seen them all + ;;coq ; proofs-as-programs + ;;crystal ; ruby at the speed of c + ;;csharp ; unity, .NET, and mono shenanigans + ;;data ; config/data formats + ;;(dart +flutter) ; paint ui and not much else + ;;dhall + ;;elixir ; erlang done right + ;;elm ; care for a cup of TEA? + emacs-lisp ; drown in parentheses + ;;erlang ; an elegant language for a more civilized age + ;;ess ; emacs speaks statistics + ;;factor + ;;faust ; dsp, but you get to keep your soul + ;;fortran ; in FORTRAN, GOD is REAL (unless declared INTEGER) + ;;fsharp ; ML stands for Microsoft's Language + ;;fstar ; (dependent) types and (monadic) effects and Z3 + ;;gdscript ; the language you waited for + ;;(go +lsp) ; the hipster dialect + ;;(graphql +lsp) ; Give queries a REST + ;;(haskell +lsp) ; a language that's lazier than I am + ;;hy ; readability of scheme w/ speed of python + ;;idris ; a language you can depend on + ;;json ; At least it ain't XML + ;;(java +lsp) ; the poster child for carpal tunnel syndrome + ;;javascript ; all(hope(abandon(ye(who(enter(here)))))) + ;;julia ; a better, faster MATLAB + ;;kotlin ; a better, slicker Java(Script) + latex ; writing papers in Emacs has never been so fun + ;;lean ; for folks with too much to prove + ;;ledger ; be audit you can be + ;;lua ; one-based indices? one-based indices + markdown ; writing docs for people to ignore + ;;nim ; python + lisp at the speed of c + nix ; I hereby declare "nix geht mehr!" + ;;ocaml ; an objective camel + org ; organize your plain life in plain text + ;;php ; perl's insecure younger brother + ;;plantuml ; diagrams for confusing people more + ;;purescript ; javascript, but functional + python ; beautiful is better than ugly + ;;qt ; the 'cutest' gui framework ever + ;;racket ; a DSL for DSLs + ;;raku ; the artist formerly known as perl6 + ;;rest ; Emacs as a REST client + ;;rst ; ReST in peace + ;;(ruby +rails) ; 1.step {|i| p "Ruby is #{i.even? ? 'love' : 'life'}"} + (rust +lsp) ; Fe2O3.unwrap().unwrap().unwrap().unwrap() + ;;scala ; java, but good + ;;(scheme +guile) ; a fully conniving family of lisps + sh ; she sells {ba,z,fi}sh shells on the C xor + ;;sml + ;;solidity ; do you need a blockchain? No. + ;;swift ; who asked for emoji variables? + ;;terra ; Earth and Moon in alignment for performance. + ;;web ; the tubes + ;;yaml ; JSON, but readable + ;;zig ; C, but simpler + + :email + ;;(mu4e +org +gmail) + ;;notmuch + ;;(wanderlust +gmail) + + :app + ;;calendar + ;;emms + ;;everywhere ; *leave* Emacs!? You must be joking + ;;irc ; how neckbeards socialize + ;;(rss +org) ; emacs as an RSS reader + + :config + ;;literate + (default +bindings +smartparens)) diff --git a/home-manager/packages/doom-emacs/.doom.d/packages.el b/home-manager/packages/doom-emacs/.doom.d/packages.el new file mode 100644 index 0000000..9f208c1 --- /dev/null +++ b/home-manager/packages/doom-emacs/.doom.d/packages.el @@ -0,0 +1,53 @@ +;; -*- no-byte-compile: t; -*- +;;; $DOOMDIR/packages.el + +;; To install a package with Doom you must declare them here and run 'doom sync' +;; on the command line, then restart Emacs for the changes to take effect -- or +;; use 'M-x doom/reload'. + + +;; To install SOME-PACKAGE from MELPA, ELPA or emacsmirror: +;; (package! some-package) + +;; To install a package directly from a remote git repo, you must specify a +;; `:recipe'. You'll find documentation on what `:recipe' accepts here: +;; https://github.com/radian-software/straight.el#the-recipe-format +;; (package! another-package +;; :recipe (:host github :repo "username/repo")) + +;; If the package you are trying to install does not contain a PACKAGENAME.el +;; file, or is located in a subdirectory of the repo, you'll need to specify +;; `:files' in the `:recipe': +;; (package! this-package +;; :recipe (:host github :repo "username/repo" +;; :files ("some-file.el" "src/lisp/*.el"))) + +;; If you'd like to disable a package included with Doom, you can do so here +;; with the `:disable' property: +;; (package! builtin-package :disable t) + +;; You can override the recipe of a built in package without having to specify +;; all the properties for `:recipe'. These will inherit the rest of its recipe +;; from Doom or MELPA/ELPA/Emacsmirror: +;; (package! builtin-package :recipe (:nonrecursive t)) +;; (package! builtin-package-2 :recipe (:repo "myfork/package")) + +;; Specify a `:branch' to install a package from a particular branch or tag. +;; This is required for some packages whose default branch isn't 'master' (which +;; our package manager can't deal with; see radian-software/straight.el#279) +;; (package! builtin-package :recipe (:branch "develop")) + +;; Use `:pin' to specify a particular commit to install. +;; (package! builtin-package :pin "1a2b3c4d5e") + + +;; Doom's packages are pinned to a specific commit and updated from release to +;; release. The `unpin!' macro allows you to unpin single packages... +;; (unpin! pinned-package) +;; ...or multiple packages +;; (unpin! pinned-package another-pinned-package) +;; ...Or *all* packages (NOT RECOMMENDED; will likely break things) +;; (unpin! t) + +(package! elcord) +(package! catppuccin-theme) diff --git a/home-manager/packages/doom-emacs/.emacs.d b/home-manager/packages/doom-emacs/.emacs.d new file mode 160000 index 0000000..f5b3958 --- /dev/null +++ b/home-manager/packages/doom-emacs/.emacs.d @@ -0,0 +1 @@ +Subproject commit f5b3958331cebf66383bf22bdc8b61cd44eca645 diff --git a/home-manager/packages/doom-emacs/.gitignore b/home-manager/packages/doom-emacs/.gitignore new file mode 100644 index 0000000..ab9d44b --- /dev/null +++ b/home-manager/packages/doom-emacs/.gitignore @@ -0,0 +1,2 @@ +!.doom.d/ +!.emacs.d/ diff --git a/home-manager/packages/emacs.nix b/home-manager/packages/emacs.nix index 865ce73..17eaa89 100644 --- a/home-manager/packages/emacs.nix +++ b/home-manager/packages/emacs.nix @@ -5,4 +5,9 @@ enable = true; package = pkgs.emacs; }; + + # environment.variables = { + # # Point Emacs to the source controlled configuration files. + # EMACSLOADPATH = builtins.getEnv "HOME" + "/.dotfiles/home-manager/packages/doom-emacs"; + # }; } From 041b37d7a7e5c855be12b3cde3158571b99ae959 Mon Sep 17 00:00:00 2001 From: lily Date: Fri, 26 Jul 2024 19:15:03 -0400 Subject: [PATCH 069/102] conf: doom-emacs dynamic --- home-manager/packages/doom-emacs/.emacs.d | 1 - home-manager/packages/doom-emacs/.gitignore | 1 - 2 files changed, 2 deletions(-) delete mode 160000 home-manager/packages/doom-emacs/.emacs.d diff --git a/home-manager/packages/doom-emacs/.emacs.d b/home-manager/packages/doom-emacs/.emacs.d deleted file mode 160000 index f5b3958..0000000 --- a/home-manager/packages/doom-emacs/.emacs.d +++ /dev/null @@ -1 +0,0 @@ -Subproject commit f5b3958331cebf66383bf22bdc8b61cd44eca645 diff --git a/home-manager/packages/doom-emacs/.gitignore b/home-manager/packages/doom-emacs/.gitignore index ab9d44b..6daab5a 100644 --- a/home-manager/packages/doom-emacs/.gitignore +++ b/home-manager/packages/doom-emacs/.gitignore @@ -1,2 +1 @@ !.doom.d/ -!.emacs.d/ From 7a13376d0990a3e61128ca387d6b67cefae222a2 Mon Sep 17 00:00:00 2001 From: lily Date: Fri, 26 Jul 2024 19:16:34 -0400 Subject: [PATCH 070/102] conf: doom-emacs dynamically --- home-manager/packages/emacs.nix | 19 ++++++++++++++----- 1 file changed, 14 insertions(+), 5 deletions(-) diff --git a/home-manager/packages/emacs.nix b/home-manager/packages/emacs.nix index 17eaa89..8d0b8ca 100644 --- a/home-manager/packages/emacs.nix +++ b/home-manager/packages/emacs.nix @@ -1,4 +1,4 @@ -{ pkgs, ... }: +{ pkgs, config, lib, ... }: { programs.emacs = { @@ -6,8 +6,17 @@ package = pkgs.emacs; }; - # environment.variables = { - # # Point Emacs to the source controlled configuration files. - # EMACSLOADPATH = builtins.getEnv "HOME" + "/.dotfiles/home-manager/packages/doom-emacs"; - # }; + home.activation = { + cloneDoomEmacs = '' + if [ ! -d "$HOME/.emacs.d" ]; then + ${pkgs.git}/bin/git clone https://github.com/doomemacs/doomemacs $HOME/.emacs.d + fi + ''; + }; + + home.file.".doom.d" = { + source = ./doom-emacs/.doom.d; + recursive = true; + onChange = builtins.getEnv "HOME" + "/.emacs.d/bin/doom sync"; + }; } From 573595b1d5fcdb09eab8cfe0a644e89eb05bc48e Mon Sep 17 00:00:00 2001 From: lily Date: Fri, 26 Jul 2024 19:23:06 -0400 Subject: [PATCH 071/102] add: zsh emacs-config alias --- home-manager/packages/zsh.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/home-manager/packages/zsh.nix b/home-manager/packages/zsh.nix index 8024214..d97aa2d 100644 --- a/home-manager/packages/zsh.nix +++ b/home-manager/packages/zsh.nix @@ -17,6 +17,7 @@ gl-clean = "sudo nix-collect-garbage --delete-old && nix-collect-garbage --delete-old && home-manager remove-generations"; snv = "sudo -E nvim"; sen = "sudo -E"; + emacs-config = "emacs --chdir $HOME/.doom.d &"; }; zplug = { From 8abce6beab0b99c76ae8bb9c38557a3494e55b41 Mon Sep 17 00:00:00 2001 From: lily Date: Fri, 26 Jul 2024 19:30:46 -0400 Subject: [PATCH 072/102] rm: unneeded modules --- .gitmodules | 3 --- 1 file changed, 3 deletions(-) delete mode 100644 .gitmodules diff --git a/.gitmodules b/.gitmodules deleted file mode 100644 index 78080c7..0000000 --- a/.gitmodules +++ /dev/null @@ -1,3 +0,0 @@ -[submodule "home-manager/packages/doom-emacs/.emacs.d"] - path = home-manager/packages/doom-emacs/.emacs.d - url = https://github.com/doomemacs/doomemacs From 37234c4da799de15fb47981df46e061482483f84 Mon Sep 17 00:00:00 2001 From: lily Date: Fri, 26 Jul 2024 19:56:45 -0400 Subject: [PATCH 073/102] fix: impure home directory reference --- home-manager/packages/emacs.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/home-manager/packages/emacs.nix b/home-manager/packages/emacs.nix index 8d0b8ca..93f1c1c 100644 --- a/home-manager/packages/emacs.nix +++ b/home-manager/packages/emacs.nix @@ -17,6 +17,6 @@ home.file.".doom.d" = { source = ./doom-emacs/.doom.d; recursive = true; - onChange = builtins.getEnv "HOME" + "/.emacs.d/bin/doom sync"; + onChange = "${config.home.homeDirectory}/.emacs.d/bin/doom sync"; }; } From 5df003a97e2ff7af4f52ba91ee8f566a04647435 Mon Sep 17 00:00:00 2001 From: lily Date: Sat, 27 Jul 2024 13:37:01 -0400 Subject: [PATCH 074/102] fix: emacs term --- home-manager/packages/emacs.nix | 1 + home-manager/packages/zsh.nix | 2 +- nixos/programs/programs.nix | 2 ++ 3 files changed, 4 insertions(+), 1 deletion(-) diff --git a/home-manager/packages/emacs.nix b/home-manager/packages/emacs.nix index 93f1c1c..6d1e57d 100644 --- a/home-manager/packages/emacs.nix +++ b/home-manager/packages/emacs.nix @@ -18,5 +18,6 @@ source = ./doom-emacs/.doom.d; recursive = true; onChange = "${config.home.homeDirectory}/.emacs.d/bin/doom sync"; + force = true; }; } diff --git a/home-manager/packages/zsh.nix b/home-manager/packages/zsh.nix index d97aa2d..f52f59c 100644 --- a/home-manager/packages/zsh.nix +++ b/home-manager/packages/zsh.nix @@ -17,7 +17,7 @@ gl-clean = "sudo nix-collect-garbage --delete-old && nix-collect-garbage --delete-old && home-manager remove-generations"; snv = "sudo -E nvim"; sen = "sudo -E"; - emacs-config = "emacs --chdir $HOME/.doom.d &"; + emacs-config = "emacs --chdir $HOME/.dotfiles/home-manager/packages/doom-emacs/.doom.d &"; }; zplug = { diff --git a/nixos/programs/programs.nix b/nixos/programs/programs.nix index 55e5c7b..048ddc9 100644 --- a/nixos/programs/programs.nix +++ b/nixos/programs/programs.nix @@ -28,5 +28,7 @@ python3 clang-tools clang + libtool + libvterm ]; } From 3ef3a3dff099743d813679ea8c94046132d68d2d Mon Sep 17 00:00:00 2001 From: lily Date: Sat, 27 Jul 2024 14:02:12 -0400 Subject: [PATCH 075/102] fix: emacs font --- home-manager/packages/doom-emacs/.doom.d/config.el | 2 +- home-manager/packages/zsh.nix | 1 - 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/home-manager/packages/doom-emacs/.doom.d/config.el b/home-manager/packages/doom-emacs/.doom.d/config.el index 4c986e7..136cbf3 100644 --- a/home-manager/packages/doom-emacs/.doom.d/config.el +++ b/home-manager/packages/doom-emacs/.doom.d/config.el @@ -21,7 +21,7 @@ ;; See 'C-h v doom-font' for documentation and more examples of what they ;; accept. For example: ;; -(setq doom-font (font-spec :family "FiraCode Nerd Font" :size 12 :weight 'semi-light) +(setq doom-font (font-spec :family "FiraCodeNF" :size 12 :weight 'semi-light) doom-variable-pitch-font (font-spec :family "Liberation Sans" :size 13)) ;; ;; If you or Emacs can't find your font, use 'M-x describe-font' to look them diff --git a/home-manager/packages/zsh.nix b/home-manager/packages/zsh.nix index f52f59c..7fb3a98 100644 --- a/home-manager/packages/zsh.nix +++ b/home-manager/packages/zsh.nix @@ -63,7 +63,6 @@ white = "#FFFFFF"; text = "#494D64"; }; - console_title_template = "{{.Folder}}{{if .Root}} :: root{{end}} :: {{.Shell}}"; blocks = [ { alignment = "left"; From 7e56bfce71f2d085ca49a1ee70cc98daf89cd9a0 Mon Sep 17 00:00:00 2001 From: lily Date: Sat, 27 Jul 2024 21:08:17 -0400 Subject: [PATCH 076/102] add(emacs): org-superstar, org-view-mode --- home-manager/packages/doom-emacs/.doom.d/config.el | 2 +- home-manager/packages/doom-emacs/.doom.d/packages.el | 5 +++++ 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/home-manager/packages/doom-emacs/.doom.d/config.el b/home-manager/packages/doom-emacs/.doom.d/config.el index 136cbf3..4c986e7 100644 --- a/home-manager/packages/doom-emacs/.doom.d/config.el +++ b/home-manager/packages/doom-emacs/.doom.d/config.el @@ -21,7 +21,7 @@ ;; See 'C-h v doom-font' for documentation and more examples of what they ;; accept. For example: ;; -(setq doom-font (font-spec :family "FiraCodeNF" :size 12 :weight 'semi-light) +(setq doom-font (font-spec :family "FiraCode Nerd Font" :size 12 :weight 'semi-light) doom-variable-pitch-font (font-spec :family "Liberation Sans" :size 13)) ;; ;; If you or Emacs can't find your font, use 'M-x describe-font' to look them diff --git a/home-manager/packages/doom-emacs/.doom.d/packages.el b/home-manager/packages/doom-emacs/.doom.d/packages.el index 9f208c1..4fe7293 100644 --- a/home-manager/packages/doom-emacs/.doom.d/packages.el +++ b/home-manager/packages/doom-emacs/.doom.d/packages.el @@ -51,3 +51,8 @@ (package! elcord) (package! catppuccin-theme) +(package! org-view-mode) +(package! org-superstar) +(add-hook 'org-mode-hook + (lambda () + (org-superstar-mode 1))) From f66f159204f9e63fed41c993c38b34ff38eec22e Mon Sep 17 00:00:00 2001 From: lily Date: Sun, 28 Jul 2024 15:46:10 -0400 Subject: [PATCH 077/102] add: bootstrap script --- bootstrap.sh | 5 +++++ 1 file changed, 5 insertions(+) create mode 100644 bootstrap.sh diff --git a/bootstrap.sh b/bootstrap.sh new file mode 100644 index 0000000..09296e2 --- /dev/null +++ b/bootstrap.sh @@ -0,0 +1,5 @@ +#!/bin/sh + +nix-channel --add https://nixos.org/channels/nixos-unstable nixos +nixos-rebuild switch --upgrade +nixos-install --flake /mnt/home/luxzi/.dotfiles From e7b83c5df83e051528364f94f8534b2f65dc7857 Mon Sep 17 00:00:00 2001 From: lily Date: Sun, 28 Jul 2024 20:20:19 -0400 Subject: [PATCH 078/102] fix(emacs): lsp --- home-manager/packages/doom-emacs/.doom.d/init.el | 2 +- home-manager/packages/doom-emacs/.doom.d/packages.el | 3 +++ 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/home-manager/packages/doom-emacs/.doom.d/init.el b/home-manager/packages/doom-emacs/.doom.d/init.el index 1d0a92e..0f20021 100644 --- a/home-manager/packages/doom-emacs/.doom.d/init.el +++ b/home-manager/packages/doom-emacs/.doom.d/init.el @@ -95,7 +95,7 @@ ;;ein ; tame Jupyter notebooks with emacs (eval +overlay) ; run code, run (also, repls) lookup ; navigate your code and its documentation - ;;lsp ; M-x vscode + lsp ; M-x vscode magit ; a git porcelain for Emacs ;;make ; run make tasks from Emacs ;;pass ; password manager for nerds diff --git a/home-manager/packages/doom-emacs/.doom.d/packages.el b/home-manager/packages/doom-emacs/.doom.d/packages.el index 4fe7293..0a8937b 100644 --- a/home-manager/packages/doom-emacs/.doom.d/packages.el +++ b/home-manager/packages/doom-emacs/.doom.d/packages.el @@ -53,6 +53,9 @@ (package! catppuccin-theme) (package! org-view-mode) (package! org-superstar) +(package! lsp-ui) + +(setq lsp-log-io t) (add-hook 'org-mode-hook (lambda () (org-superstar-mode 1))) From 4c35560ad24fea0f791945f57898e2d476dec945 Mon Sep 17 00:00:00 2001 From: lily Date: Mon, 29 Jul 2024 15:07:16 -0400 Subject: [PATCH 079/102] add(emacs): svelte lsp --- home-manager/packages/doom-emacs/.doom.d/packages.el | 1 + 1 file changed, 1 insertion(+) diff --git a/home-manager/packages/doom-emacs/.doom.d/packages.el b/home-manager/packages/doom-emacs/.doom.d/packages.el index 0a8937b..21c629a 100644 --- a/home-manager/packages/doom-emacs/.doom.d/packages.el +++ b/home-manager/packages/doom-emacs/.doom.d/packages.el @@ -54,6 +54,7 @@ (package! org-view-mode) (package! org-superstar) (package! lsp-ui) +(package! svelte-mode) (setq lsp-log-io t) (add-hook 'org-mode-hook From 6ec3ff4fa6d72936d9594d603bd77a991d538a41 Mon Sep 17 00:00:00 2001 From: lily Date: Mon, 29 Jul 2024 15:35:15 -0400 Subject: [PATCH 080/102] add(emacs): typescript lsp --- home-manager/packages/doom-emacs/.doom.d/packages.el | 1 + 1 file changed, 1 insertion(+) diff --git a/home-manager/packages/doom-emacs/.doom.d/packages.el b/home-manager/packages/doom-emacs/.doom.d/packages.el index 21c629a..4047ab8 100644 --- a/home-manager/packages/doom-emacs/.doom.d/packages.el +++ b/home-manager/packages/doom-emacs/.doom.d/packages.el @@ -55,6 +55,7 @@ (package! org-superstar) (package! lsp-ui) (package! svelte-mode) +(package! typescript-mode) (setq lsp-log-io t) (add-hook 'org-mode-hook From 84205c9b0893cd83c92ad265b0b6962ee0f58bee Mon Sep 17 00:00:00 2001 From: lily Date: Tue, 30 Jul 2024 23:25:18 -0400 Subject: [PATCH 081/102] add: tor browser --- home-manager/packages/packages.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/home-manager/packages/packages.nix b/home-manager/packages/packages.nix index 8d0c2bd..06c3b4c 100644 --- a/home-manager/packages/packages.nix +++ b/home-manager/packages/packages.nix @@ -20,5 +20,6 @@ prismlauncher fzf zoxide + tor-browser ]; } From ca149ecc893ce2359999a27fb91f2a363235cab7 Mon Sep 17 00:00:00 2001 From: lily Date: Wed, 31 Jul 2024 18:54:46 -0400 Subject: [PATCH 082/102] add: pkg-config openssl --- nixos/programs/programs.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/nixos/programs/programs.nix b/nixos/programs/programs.nix index 048ddc9..68581da 100644 --- a/nixos/programs/programs.nix +++ b/nixos/programs/programs.nix @@ -30,5 +30,7 @@ clang libtool libvterm + pkg-config + openssl ]; } From 9e1923e513d0f5cbd9ff83ea3eebf32f977eb798 Mon Sep 17 00:00:00 2001 From: lily Date: Thu, 1 Aug 2024 18:33:11 -0400 Subject: [PATCH 083/102] add: nix-search-cli --- home-manager/packages/packages.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/home-manager/packages/packages.nix b/home-manager/packages/packages.nix index 06c3b4c..c01347b 100644 --- a/home-manager/packages/packages.nix +++ b/home-manager/packages/packages.nix @@ -21,5 +21,6 @@ fzf zoxide tor-browser + nix-search-cli ]; } From d582a11ed8c9725126d6f0de05d37bd1e2c09716 Mon Sep 17 00:00:00 2001 From: lily Date: Thu, 1 Aug 2024 19:03:50 -0400 Subject: [PATCH 084/102] add(emacs): haskell lsp --- home-manager/packages/doom-emacs/.doom.d/init.el | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/home-manager/packages/doom-emacs/.doom.d/init.el b/home-manager/packages/doom-emacs/.doom.d/init.el index 0f20021..29f6206 100644 --- a/home-manager/packages/doom-emacs/.doom.d/init.el +++ b/home-manager/packages/doom-emacs/.doom.d/init.el @@ -135,7 +135,7 @@ ;;gdscript ; the language you waited for ;;(go +lsp) ; the hipster dialect ;;(graphql +lsp) ; Give queries a REST - ;;(haskell +lsp) ; a language that's lazier than I am + (haskell +lsp) ; a language that's lazier than I am ;;hy ; readability of scheme w/ speed of python ;;idris ; a language you can depend on ;;json ; At least it ain't XML From f07bda4e8a51fa9b78f0b90ad146e793b3a14f95 Mon Sep 17 00:00:00 2001 From: lily Date: Fri, 2 Aug 2024 16:51:16 -0400 Subject: [PATCH 085/102] add: hyprland config --- flake.lock | 16 ++ flake.nix | 8 +- home-manager/packages/hyprland/dunst.nix | 16 ++ home-manager/packages/hyprland/hyprland.nix | 143 +++++++++++++++ home-manager/packages/hyprland/hyprlock.nix | 39 +++++ home-manager/packages/hyprland/waybar.nix | 112 ++++++++++++ home-manager/packages/hyprland/wofi.nix | 185 ++++++++++++++++++++ home-manager/packages/kitty.nix | 2 + home-manager/packages/packages.nix | 3 + nixos/configuration.nix | 3 +- nixos/environments/hyprland.nix | 17 ++ 11 files changed, 540 insertions(+), 4 deletions(-) create mode 100644 home-manager/packages/hyprland/dunst.nix create mode 100644 home-manager/packages/hyprland/hyprland.nix create mode 100644 home-manager/packages/hyprland/hyprlock.nix create mode 100644 home-manager/packages/hyprland/waybar.nix create mode 100644 home-manager/packages/hyprland/wofi.nix create mode 100644 nixos/environments/hyprland.nix diff --git a/flake.lock b/flake.lock index 7deb4a9..9d35b51 100644 --- a/flake.lock +++ b/flake.lock @@ -1,5 +1,20 @@ { "nodes": { + "catppuccin": { + "locked": { + "lastModified": 1721784420, + "narHash": "sha256-bgF6fN4Qgk7NErFKGuuqWXcLORsiykTYyqMUFRiAUBY=", + "owner": "catppuccin", + "repo": "nix", + "rev": "8bdb55cc1c13f572b6e4307a3c0d64f1ae286a4f", + "type": "github" + }, + "original": { + "owner": "catppuccin", + "repo": "nix", + "type": "github" + } + }, "home-manager": { "inputs": { "nixpkgs": [ @@ -38,6 +53,7 @@ }, "root": { "inputs": { + "catppuccin": "catppuccin", "home-manager": "home-manager", "nixpkgs": "nixpkgs" } diff --git a/flake.nix b/flake.nix index c55fea8..168f604 100644 --- a/flake.nix +++ b/flake.nix @@ -5,9 +5,11 @@ nixpkgs.url = "github:NixOS/nixpkgs/nixos-unstable"; home-manager.url = "github:nix-community/home-manager"; home-manager.inputs.nixpkgs.follows = "nixpkgs"; + + catppuccin.url = "github:catppuccin/nix"; }; - outputs = { self, nixpkgs, home-manager, ... }: + outputs = { self, nixpkgs, home-manager, catppuccin, ... }: let lib = nixpkgs.lib; pkgs = nixpkgs.legacyPackages."x86_64-linux"; @@ -15,13 +17,13 @@ nixosConfigurations = { nixos = lib.nixosSystem { specialArgs = { inherit self; }; - modules = [ ./nixos/configuration.nix ]; + modules = [ ./nixos/configuration.nix catppuccin.nixosModules.catppuccin ]; }; }; homeConfigurations = { luxzi = home-manager.lib.homeManagerConfiguration { inherit pkgs; - modules = [ ./home-manager/home.nix ]; + modules = [ ./home-manager/home.nix catppuccin.homeManagerModules.catppuccin ]; }; }; }; diff --git a/home-manager/packages/hyprland/dunst.nix b/home-manager/packages/hyprland/dunst.nix new file mode 100644 index 0000000..e4c474d --- /dev/null +++ b/home-manager/packages/hyprland/dunst.nix @@ -0,0 +1,16 @@ +{ ... }: + +{ + services.dunst = { + enable = true; + catppuccin.enable = true; + settings = { + global = { + offset = "10x10"; + origin = "bottom-right"; + width = 300; + height = 500; + }; + }; + }; +} diff --git a/home-manager/packages/hyprland/hyprland.nix b/home-manager/packages/hyprland/hyprland.nix new file mode 100644 index 0000000..5f306c0 --- /dev/null +++ b/home-manager/packages/hyprland/hyprland.nix @@ -0,0 +1,143 @@ +{ pkgs, ... }: + +{ + imports = [ + ./waybar.nix + ./wofi.nix + ./dunst.nix + ./hyprlock.nix + ]; + + wayland.windowManager.hyprland = { + enable = true; + systemd.enable = true; + extraConfig = '' + # Monitors + monitor =HDMI-A-1,2560x1080@75,auto,1 + + # Autostart + exec = pkill waybar; sleep 0.5; waybar + exec = pkill swaybg; sleep 0.5; swaybg + exec = waypaper --restore + + env = LIBVA_DRIVER_NAME,nvidia + env = XDG_SESSION_TYPE,wayland + env = GBM_BACKEND,nvidia-drm + env = __GLX_VENDOR_LIBRARY_NAME,nvidia + env = NVD_BACKEND,direct + + # Input config + input { + kb_layout = us + follow_mouse = 1 + sensitivity = 0 + } + + general { + gaps_in = 5 + gaps_out = 10 + border_size = 2 + col.active_border = rgba(89b4faff) rgba(b4befeff) 45deg + col.inactive_border = rgba(45475aff) + } + + decoration { + rounding = 10 + + blur { + enabled = true + size = 15 + passes = 1 + new_optimizations = true + } + + drop_shadow = true + shadow_range = 4 + shadow_render_power = 3 + col.shadow = rgba(1e1e2ebb) + } + + animations { + enabled = true + + } + + cursor { + no_hardware_cursors = true + } + + $mainMod = SUPER + + bind = $mainMod, m, exit, + bind = $mainMod, v, togglefloating, + bind = $mainMod, q, killactive, + bind = $mainMod, s, togglesplit, + bind = $mainMod, f, fullscreen, + bind = $mainMod, p, pin, + + bind =, Print, exec, grim - | wl-copy + bind = SHIFT, Print, exec, grim -g "$(slurp)" - | wl-copy + + bind = $mainMod, r, exec, wofi --show drun --allow-images + + bind = $mainMod,Tab,cyclenext, + bind = $mainMod,Tab,bringactivetotop, + + bind = $mainMod,e,exec,hyprlock + + bind = $mainMod, h, movefocus, l + bind = $mainMod, j, movefocus, d + bind = $mainMod, k, movefocus, u + bind = $mainMod, l, movefocus, r + + 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 + + bind = $mainMod SHIFT, 1, movetoworkspace, 1 + bind = $mainMod SHIFT, 2, movetoworkspace, 2 + bind = $mainMod SHIFT, 3, movetoworkspace, 3 + bind = $mainMod SHIFT, 4, movetoworkspace, 4 + bind = $mainMod SHIFT, 5, movetoworkspace, 5 + bind = $mainMod SHIFT, 6, movetoworkspace, 6 + bind = $mainMod SHIFT, 7, movetoworkspace, 7 + bind = $mainMod SHIFT, 8, movetoworkspace, 8 + bind = $mainMod SHIFT, 9, movetoworkspace, 9 + bind = $mainMod SHIFT, 0, movetoworkspace, 10 + + bind = $mainMod, mouse_down, workspace, e+1 + bind = $mainMod, mouse_up, workspace, e-1 + + bindm = $mainMod, mouse:272, movewindow + bindm = $mainMod, mouse:273, resizewindow + bindm = ALT, mouse:272, resizewindow + ''; + }; + + home.packages = with pkgs; [ + wofi + waypaper + swaybg + waybar + pavucontrol + libsForQt5.qtstyleplugins + libsForQt5.qt5ct + kdePackages.qt6ct + kdePackages.breeze + breeze-gtk + catppuccin + grim + slurp + catppuccin-kvantum + kdePackages.qtstyleplugin-kvantum + ]; + + catppuccin.flavor = "mocha"; +} diff --git a/home-manager/packages/hyprland/hyprlock.nix b/home-manager/packages/hyprland/hyprlock.nix new file mode 100644 index 0000000..d9ce20a --- /dev/null +++ b/home-manager/packages/hyprland/hyprlock.nix @@ -0,0 +1,39 @@ +{ ... }: + +{ + programs.hyprlock = { + enable = true; + settings = { + general = { + disable_loading_bar = true; + grace = 0; + hide_cursor = true; + no_fade_in = false; + }; + + background = [ + { + path = "screenshot"; + blur_passes = 3; + blur_size = 8; + } + ]; + + input-field = [ + { + size = "200, 50"; + position = "0, -80"; + monitor = ""; + dots_center = true; + fade_on_empty = false; + font_color = "rgb(202, 211, 245)"; + inner_color = "rgb(91, 96, 120)"; + outer_color = "rgb(24, 25, 38)"; + outline_thickness = 5; + placeholder_text = ''Password...''; + shadow_passes = 2; + } + ]; + }; + }; +} diff --git a/home-manager/packages/hyprland/waybar.nix b/home-manager/packages/hyprland/waybar.nix new file mode 100644 index 0000000..c661e47 --- /dev/null +++ b/home-manager/packages/hyprland/waybar.nix @@ -0,0 +1,112 @@ +{ ... }: + +{ + programs.waybar = { + enable = true; + style = '' + * { + font-family: "FiraCode Nerd Font", sans-serif; + } + + window#waybar { + background-color: #1e1e2e; + color: #cdd6f4; + transition-property: background-color; + transition-duration: 500ms; + border: 1px solid transparent; + border-radius: 0px 0px 20px 20px; + } + + button { + box-shadow: inset 0px -3px transparent; + } + + button:hover { + background: #181825; + } + + #workspaces { + background: #1e1e2e; + } + + #workspaces button { + padding: 5px; + background-color: transparent; + color: #cdd6f4; + } + + #workspaces button:hover { + background: #181825; + } + + #workspaces button.active { + background-color: #313244; + } + + #workspaces button.urgent { + background-color: #f9e2af; + } + + #window, + #pulseaudio, + #network, + #tray, + #clock { + background-color: #1e1e2e; + color: #cdd6f4; + padding: 0px 5px 0px 5px; + } + + .modules-right { + padding-right: 10px; + } + + .modules-left { + padding-left: 10px; + } + ''; + settings = { + mainBar = { + height = 30; + width = 1920; + spacing = 4; + modules-left = [ "hyprland/workspaces" ]; + modules-center = [ "hyprland/window" ]; + modules-right = [ "tray" "pulseaudio" "network" "clock" ]; + + "hyprland/window" = { + icon = true; + format = "{initialTitle}"; + }; + + network = { + format-wifi = "{essid} ({signalStrength}%)  "; + format-ethernet = "{ipaddr}/{cidr} "; + tooltip-format = "{ifname} via {gwaddr} "; + format-linked = "{ifname} (No IP) "; + format-disconnected = "Disconnected ⚠"; + format-alt = "{ifname}: {ipaddr}/{cidr}"; + }; + + pulseaudio = { + format = "{volume}% {icon} {format_source}"; + format-bluetooth = "{volume}% {icon} {format_source}"; + format-bluetooth-muted = " {icon} {format_source}"; + format-muted = " {format_source}"; + format-source = "{volume}% "; + format-source-muted = ""; + format-icons = { + headphone = " "; + hands-free = ""; + headset = ""; + phone = ""; + portable = ""; + car = ""; + default = [ "" "" " " ]; + }; + on-click = "pavucontrol"; + }; + }; + }; + }; +} diff --git a/home-manager/packages/hyprland/wofi.nix b/home-manager/packages/hyprland/wofi.nix new file mode 100644 index 0000000..a6fcbec --- /dev/null +++ b/home-manager/packages/hyprland/wofi.nix @@ -0,0 +1,185 @@ +{ ... }: + +{ + programs.wofi = { + enable = true; + style = '' + @define-color rosewater #f5e0dc; + @define-color rosewater-rgb rgb(245, 224, 220); + @define-color flamingo #f2cdcd; + @define-color flamingo-rgb rgb(242, 205, 205); + @define-color pink #f5c2e7; + @define-color pink-rgb rgb(245, 194, 231); + @define-color mauve #cba6f7; + @define-color mauve-rgb rgb(203, 166, 247); + @define-color red #f38ba8; + @define-color red-rgb rgb(243, 139, 168); + @define-color maroon #eba0ac; + @define-color maroon-rgb rgb(235, 160, 172); + @define-color peach #fab387; + @define-color peach-rgb rgb(250, 179, 135); + @define-color yellow #f9e2af; + @define-color yellow-rgb rgb(249, 226, 175); + @define-color green #a6e3a1; + @define-color green-rgb rgb(166, 227, 161); + @define-color teal #94e2d5; + @define-color teal-rgb rgb(148, 226, 213); + @define-color sky #89dceb; + @define-color sky-rgb rgb(137, 220, 235); + @define-color sapphire #74c7ec; + @define-color sapphire-rgb rgb(116, 199, 236); + @define-color blue #89b4fa; + @define-color blue-rgb rgb(137, 180, 250); + @define-color lavender #b4befe; + @define-color lavender-rgb rgb(180, 190, 254); + @define-color text #cdd6f4; + @define-color text-rgb rgb(205, 214, 244); + @define-color subtext1 #bac2de; + @define-color subtext1-rgb rgb(186, 194, 222); + @define-color subtext0 #a6adc8; + @define-color subtext0-rgb rgb(166, 173, 200); + @define-color overlay2 #9399b2; + @define-color overlay2-rgb rgb(147, 153, 178); + @define-color overlay1 #7f849c; + @define-color overlay1-rgb rgb(127, 132, 156); + @define-color overlay0 #6c7086; + @define-color overlay0-rgb rgb(108, 112, 134); + @define-color surface2 #585b70; + @define-color surface2-rgb rgb(88, 91, 112); + @define-color surface1 #45475a; + @define-color surface1-rgb rgb(69, 71, 90); + @define-color surface0 #313244; + @define-color surface0-rgb rgb(49, 50, 68); + @define-color base #1e1e2e; + @define-color base-rgb rgb(30, 30, 46); + @define-color mantle #181825; + @define-color mantle-rgb rgb(24, 24, 37); + @define-color crust #11111b; + @define-color crust-rgb rgb(17, 17, 27); + + * { + font-family: 'FiraCode Nerd Font', monospace; + font-size: 14px; + } + + /* Window */ + window { + margin: 0px; + padding: 10px; + border: 0.16em solid @lavender; + border-radius: 20px; + background-color: @base; + 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; + border-radius: 20px; + background-color: @base; + 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; + border-radius: 20px; + background-color: @base; + } + + /* Scroll */ + #scroll { + margin: 0px; + padding: 10px; + border: none; + background-color: @base; + } + + /* Input */ + #input { + margin: 5px 20px; + padding: 10px; + border: none; + border-radius: 20px; + color: @text; + background-color: @base; + animation: fadeIn 0.5s ease-in-out both; + } + + #input image { + border: none; + color: @red; + } + + #input * { + outline: 4px solid @red!important; + } + + /* Text */ + #text { + margin: 5px; + border: none; + color: @text; + animation: fadeIn 0.5s ease-in-out both; + } + + #entry { + background-color: @base; + padding: 10px; + } + + #entry arrow { + border: none; + color: @lavender; + } + + /* Selected Entry */ + #entry:selected { + border: 0.11em solid @lavender; + border-radius: 20px; + } + + #entry:selected #text { + color: @mauve; + } + + #entry:drop(active) { + background-color: @lavender!important; + } + + ''; + settings = { + no_actions = true; + display = "grid"; + columns = 4; + rows = 3; + + }; + }; +} diff --git a/home-manager/packages/kitty.nix b/home-manager/packages/kitty.nix index cb0d531..ac34fa4 100644 --- a/home-manager/packages/kitty.nix +++ b/home-manager/packages/kitty.nix @@ -11,6 +11,8 @@ }; settings = { window_padding_width = 4; + background_opacity = "0.65"; + background_blur = 1; }; }; } diff --git a/home-manager/packages/packages.nix b/home-manager/packages/packages.nix index c01347b..57328d9 100644 --- a/home-manager/packages/packages.nix +++ b/home-manager/packages/packages.nix @@ -7,6 +7,7 @@ ./git.nix ./emacs.nix ./kitty.nix + ./hyprland/hyprland.nix ]; home.packages = with pkgs; [ @@ -22,5 +23,7 @@ zoxide tor-browser nix-search-cli + mpv + dolphin ]; } diff --git a/nixos/configuration.nix b/nixos/configuration.nix index 21c024e..c19a254 100644 --- a/nixos/configuration.nix +++ b/nixos/configuration.nix @@ -4,7 +4,8 @@ imports = [ # Include the results of the hardware scan. ./hardware/hardware.nix - ./environments/plasma-wayland.nix + # ./environments/plasma-wayland.nix + ./environments/hyprland.nix ./users/luxzi.nix ./services/services.nix ./programs/programs.nix diff --git a/nixos/environments/hyprland.nix b/nixos/environments/hyprland.nix new file mode 100644 index 0000000..7d45e1f --- /dev/null +++ b/nixos/environments/hyprland.nix @@ -0,0 +1,17 @@ +{ config, lib, pkgs, ... }: + +{ + programs.hyprland = { + enable = true; + xwayland.enable = true; + }; + + services.xserver.videoDrivers = ["nvidia"]; + services.displayManager.sddm.enable = true; + services.displayManager.sddm.wayland.enable = true; + services.displayManager.sddm.theme = "Breeze"; + + environment.variables.QT_QPA_PLATFORM = "wayland"; + environment.variables.QT_QPA_PLATFORMTHEME = "qt6ct"; + environment.variables.GTK_THEME = "Breeze"; +} From d8e4776b869fcd4a7a74ebcb223c199f73dba310 Mon Sep 17 00:00:00 2001 From: lily Date: Mon, 23 Sep 2024 23:22:39 -0400 Subject: [PATCH 086/102] dep: deprecated hyprland, added gnome --- home-manager/packages/hyprland/dunst.nix | 16 -- home-manager/packages/hyprland/hyprland.nix | 143 --------------- home-manager/packages/hyprland/hyprlock.nix | 39 ----- home-manager/packages/hyprland/waybar.nix | 112 ------------ home-manager/packages/hyprland/wofi.nix | 185 -------------------- home-manager/packages/packages.nix | 5 - nixos/configuration.nix | 2 +- nixos/environments/gnome.nix | 7 + nixos/environments/hyprland.nix | 17 -- 9 files changed, 8 insertions(+), 518 deletions(-) delete mode 100644 home-manager/packages/hyprland/dunst.nix delete mode 100644 home-manager/packages/hyprland/hyprland.nix delete mode 100644 home-manager/packages/hyprland/hyprlock.nix delete mode 100644 home-manager/packages/hyprland/waybar.nix delete mode 100644 home-manager/packages/hyprland/wofi.nix create mode 100644 nixos/environments/gnome.nix delete mode 100644 nixos/environments/hyprland.nix diff --git a/home-manager/packages/hyprland/dunst.nix b/home-manager/packages/hyprland/dunst.nix deleted file mode 100644 index e4c474d..0000000 --- a/home-manager/packages/hyprland/dunst.nix +++ /dev/null @@ -1,16 +0,0 @@ -{ ... }: - -{ - services.dunst = { - enable = true; - catppuccin.enable = true; - settings = { - global = { - offset = "10x10"; - origin = "bottom-right"; - width = 300; - height = 500; - }; - }; - }; -} diff --git a/home-manager/packages/hyprland/hyprland.nix b/home-manager/packages/hyprland/hyprland.nix deleted file mode 100644 index 5f306c0..0000000 --- a/home-manager/packages/hyprland/hyprland.nix +++ /dev/null @@ -1,143 +0,0 @@ -{ pkgs, ... }: - -{ - imports = [ - ./waybar.nix - ./wofi.nix - ./dunst.nix - ./hyprlock.nix - ]; - - wayland.windowManager.hyprland = { - enable = true; - systemd.enable = true; - extraConfig = '' - # Monitors - monitor =HDMI-A-1,2560x1080@75,auto,1 - - # Autostart - exec = pkill waybar; sleep 0.5; waybar - exec = pkill swaybg; sleep 0.5; swaybg - exec = waypaper --restore - - env = LIBVA_DRIVER_NAME,nvidia - env = XDG_SESSION_TYPE,wayland - env = GBM_BACKEND,nvidia-drm - env = __GLX_VENDOR_LIBRARY_NAME,nvidia - env = NVD_BACKEND,direct - - # Input config - input { - kb_layout = us - follow_mouse = 1 - sensitivity = 0 - } - - general { - gaps_in = 5 - gaps_out = 10 - border_size = 2 - col.active_border = rgba(89b4faff) rgba(b4befeff) 45deg - col.inactive_border = rgba(45475aff) - } - - decoration { - rounding = 10 - - blur { - enabled = true - size = 15 - passes = 1 - new_optimizations = true - } - - drop_shadow = true - shadow_range = 4 - shadow_render_power = 3 - col.shadow = rgba(1e1e2ebb) - } - - animations { - enabled = true - - } - - cursor { - no_hardware_cursors = true - } - - $mainMod = SUPER - - bind = $mainMod, m, exit, - bind = $mainMod, v, togglefloating, - bind = $mainMod, q, killactive, - bind = $mainMod, s, togglesplit, - bind = $mainMod, f, fullscreen, - bind = $mainMod, p, pin, - - bind =, Print, exec, grim - | wl-copy - bind = SHIFT, Print, exec, grim -g "$(slurp)" - | wl-copy - - bind = $mainMod, r, exec, wofi --show drun --allow-images - - bind = $mainMod,Tab,cyclenext, - bind = $mainMod,Tab,bringactivetotop, - - bind = $mainMod,e,exec,hyprlock - - bind = $mainMod, h, movefocus, l - bind = $mainMod, j, movefocus, d - bind = $mainMod, k, movefocus, u - bind = $mainMod, l, movefocus, r - - 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 - - bind = $mainMod SHIFT, 1, movetoworkspace, 1 - bind = $mainMod SHIFT, 2, movetoworkspace, 2 - bind = $mainMod SHIFT, 3, movetoworkspace, 3 - bind = $mainMod SHIFT, 4, movetoworkspace, 4 - bind = $mainMod SHIFT, 5, movetoworkspace, 5 - bind = $mainMod SHIFT, 6, movetoworkspace, 6 - bind = $mainMod SHIFT, 7, movetoworkspace, 7 - bind = $mainMod SHIFT, 8, movetoworkspace, 8 - bind = $mainMod SHIFT, 9, movetoworkspace, 9 - bind = $mainMod SHIFT, 0, movetoworkspace, 10 - - bind = $mainMod, mouse_down, workspace, e+1 - bind = $mainMod, mouse_up, workspace, e-1 - - bindm = $mainMod, mouse:272, movewindow - bindm = $mainMod, mouse:273, resizewindow - bindm = ALT, mouse:272, resizewindow - ''; - }; - - home.packages = with pkgs; [ - wofi - waypaper - swaybg - waybar - pavucontrol - libsForQt5.qtstyleplugins - libsForQt5.qt5ct - kdePackages.qt6ct - kdePackages.breeze - breeze-gtk - catppuccin - grim - slurp - catppuccin-kvantum - kdePackages.qtstyleplugin-kvantum - ]; - - catppuccin.flavor = "mocha"; -} diff --git a/home-manager/packages/hyprland/hyprlock.nix b/home-manager/packages/hyprland/hyprlock.nix deleted file mode 100644 index d9ce20a..0000000 --- a/home-manager/packages/hyprland/hyprlock.nix +++ /dev/null @@ -1,39 +0,0 @@ -{ ... }: - -{ - programs.hyprlock = { - enable = true; - settings = { - general = { - disable_loading_bar = true; - grace = 0; - hide_cursor = true; - no_fade_in = false; - }; - - background = [ - { - path = "screenshot"; - blur_passes = 3; - blur_size = 8; - } - ]; - - input-field = [ - { - size = "200, 50"; - position = "0, -80"; - monitor = ""; - dots_center = true; - fade_on_empty = false; - font_color = "rgb(202, 211, 245)"; - inner_color = "rgb(91, 96, 120)"; - outer_color = "rgb(24, 25, 38)"; - outline_thickness = 5; - placeholder_text = ''Password...''; - shadow_passes = 2; - } - ]; - }; - }; -} diff --git a/home-manager/packages/hyprland/waybar.nix b/home-manager/packages/hyprland/waybar.nix deleted file mode 100644 index c661e47..0000000 --- a/home-manager/packages/hyprland/waybar.nix +++ /dev/null @@ -1,112 +0,0 @@ -{ ... }: - -{ - programs.waybar = { - enable = true; - style = '' - * { - font-family: "FiraCode Nerd Font", sans-serif; - } - - window#waybar { - background-color: #1e1e2e; - color: #cdd6f4; - transition-property: background-color; - transition-duration: 500ms; - border: 1px solid transparent; - border-radius: 0px 0px 20px 20px; - } - - button { - box-shadow: inset 0px -3px transparent; - } - - button:hover { - background: #181825; - } - - #workspaces { - background: #1e1e2e; - } - - #workspaces button { - padding: 5px; - background-color: transparent; - color: #cdd6f4; - } - - #workspaces button:hover { - background: #181825; - } - - #workspaces button.active { - background-color: #313244; - } - - #workspaces button.urgent { - background-color: #f9e2af; - } - - #window, - #pulseaudio, - #network, - #tray, - #clock { - background-color: #1e1e2e; - color: #cdd6f4; - padding: 0px 5px 0px 5px; - } - - .modules-right { - padding-right: 10px; - } - - .modules-left { - padding-left: 10px; - } - ''; - settings = { - mainBar = { - height = 30; - width = 1920; - spacing = 4; - modules-left = [ "hyprland/workspaces" ]; - modules-center = [ "hyprland/window" ]; - modules-right = [ "tray" "pulseaudio" "network" "clock" ]; - - "hyprland/window" = { - icon = true; - format = "{initialTitle}"; - }; - - network = { - format-wifi = "{essid} ({signalStrength}%)  "; - format-ethernet = "{ipaddr}/{cidr} "; - tooltip-format = "{ifname} via {gwaddr} "; - format-linked = "{ifname} (No IP) "; - format-disconnected = "Disconnected ⚠"; - format-alt = "{ifname}: {ipaddr}/{cidr}"; - }; - - pulseaudio = { - format = "{volume}% {icon} {format_source}"; - format-bluetooth = "{volume}% {icon} {format_source}"; - format-bluetooth-muted = " {icon} {format_source}"; - format-muted = " {format_source}"; - format-source = "{volume}% "; - format-source-muted = ""; - format-icons = { - headphone = " "; - hands-free = ""; - headset = ""; - phone = ""; - portable = ""; - car = ""; - default = [ "" "" " " ]; - }; - on-click = "pavucontrol"; - }; - }; - }; - }; -} diff --git a/home-manager/packages/hyprland/wofi.nix b/home-manager/packages/hyprland/wofi.nix deleted file mode 100644 index a6fcbec..0000000 --- a/home-manager/packages/hyprland/wofi.nix +++ /dev/null @@ -1,185 +0,0 @@ -{ ... }: - -{ - programs.wofi = { - enable = true; - style = '' - @define-color rosewater #f5e0dc; - @define-color rosewater-rgb rgb(245, 224, 220); - @define-color flamingo #f2cdcd; - @define-color flamingo-rgb rgb(242, 205, 205); - @define-color pink #f5c2e7; - @define-color pink-rgb rgb(245, 194, 231); - @define-color mauve #cba6f7; - @define-color mauve-rgb rgb(203, 166, 247); - @define-color red #f38ba8; - @define-color red-rgb rgb(243, 139, 168); - @define-color maroon #eba0ac; - @define-color maroon-rgb rgb(235, 160, 172); - @define-color peach #fab387; - @define-color peach-rgb rgb(250, 179, 135); - @define-color yellow #f9e2af; - @define-color yellow-rgb rgb(249, 226, 175); - @define-color green #a6e3a1; - @define-color green-rgb rgb(166, 227, 161); - @define-color teal #94e2d5; - @define-color teal-rgb rgb(148, 226, 213); - @define-color sky #89dceb; - @define-color sky-rgb rgb(137, 220, 235); - @define-color sapphire #74c7ec; - @define-color sapphire-rgb rgb(116, 199, 236); - @define-color blue #89b4fa; - @define-color blue-rgb rgb(137, 180, 250); - @define-color lavender #b4befe; - @define-color lavender-rgb rgb(180, 190, 254); - @define-color text #cdd6f4; - @define-color text-rgb rgb(205, 214, 244); - @define-color subtext1 #bac2de; - @define-color subtext1-rgb rgb(186, 194, 222); - @define-color subtext0 #a6adc8; - @define-color subtext0-rgb rgb(166, 173, 200); - @define-color overlay2 #9399b2; - @define-color overlay2-rgb rgb(147, 153, 178); - @define-color overlay1 #7f849c; - @define-color overlay1-rgb rgb(127, 132, 156); - @define-color overlay0 #6c7086; - @define-color overlay0-rgb rgb(108, 112, 134); - @define-color surface2 #585b70; - @define-color surface2-rgb rgb(88, 91, 112); - @define-color surface1 #45475a; - @define-color surface1-rgb rgb(69, 71, 90); - @define-color surface0 #313244; - @define-color surface0-rgb rgb(49, 50, 68); - @define-color base #1e1e2e; - @define-color base-rgb rgb(30, 30, 46); - @define-color mantle #181825; - @define-color mantle-rgb rgb(24, 24, 37); - @define-color crust #11111b; - @define-color crust-rgb rgb(17, 17, 27); - - * { - font-family: 'FiraCode Nerd Font', monospace; - font-size: 14px; - } - - /* Window */ - window { - margin: 0px; - padding: 10px; - border: 0.16em solid @lavender; - border-radius: 20px; - background-color: @base; - 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; - border-radius: 20px; - background-color: @base; - 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; - border-radius: 20px; - background-color: @base; - } - - /* Scroll */ - #scroll { - margin: 0px; - padding: 10px; - border: none; - background-color: @base; - } - - /* Input */ - #input { - margin: 5px 20px; - padding: 10px; - border: none; - border-radius: 20px; - color: @text; - background-color: @base; - animation: fadeIn 0.5s ease-in-out both; - } - - #input image { - border: none; - color: @red; - } - - #input * { - outline: 4px solid @red!important; - } - - /* Text */ - #text { - margin: 5px; - border: none; - color: @text; - animation: fadeIn 0.5s ease-in-out both; - } - - #entry { - background-color: @base; - padding: 10px; - } - - #entry arrow { - border: none; - color: @lavender; - } - - /* Selected Entry */ - #entry:selected { - border: 0.11em solid @lavender; - border-radius: 20px; - } - - #entry:selected #text { - color: @mauve; - } - - #entry:drop(active) { - background-color: @lavender!important; - } - - ''; - settings = { - no_actions = true; - display = "grid"; - columns = 4; - rows = 3; - - }; - }; -} diff --git a/home-manager/packages/packages.nix b/home-manager/packages/packages.nix index 57328d9..38a387d 100644 --- a/home-manager/packages/packages.nix +++ b/home-manager/packages/packages.nix @@ -7,20 +7,15 @@ ./git.nix ./emacs.nix ./kitty.nix - ./hyprland/hyprland.nix ]; home.packages = with pkgs; [ - rustup hyfetch nix-output-monitor - alvr firefox tree vesktop - prismlauncher fzf - zoxide tor-browser nix-search-cli mpv diff --git a/nixos/configuration.nix b/nixos/configuration.nix index c19a254..918c017 100644 --- a/nixos/configuration.nix +++ b/nixos/configuration.nix @@ -5,7 +5,7 @@ [ # Include the results of the hardware scan. ./hardware/hardware.nix # ./environments/plasma-wayland.nix - ./environments/hyprland.nix + ./environments/gnome.nix ./users/luxzi.nix ./services/services.nix ./programs/programs.nix diff --git a/nixos/environments/gnome.nix b/nixos/environments/gnome.nix new file mode 100644 index 0000000..09b3483 --- /dev/null +++ b/nixos/environments/gnome.nix @@ -0,0 +1,7 @@ +{ ... }: + +{ + services.xserver.enable = false; + services.xserver.displayManager.gdm.enable = true; + services.xserver.desktopManager.gnome.enable = true; +} \ No newline at end of file diff --git a/nixos/environments/hyprland.nix b/nixos/environments/hyprland.nix deleted file mode 100644 index 7d45e1f..0000000 --- a/nixos/environments/hyprland.nix +++ /dev/null @@ -1,17 +0,0 @@ -{ config, lib, pkgs, ... }: - -{ - programs.hyprland = { - enable = true; - xwayland.enable = true; - }; - - services.xserver.videoDrivers = ["nvidia"]; - services.displayManager.sddm.enable = true; - services.displayManager.sddm.wayland.enable = true; - services.displayManager.sddm.theme = "Breeze"; - - environment.variables.QT_QPA_PLATFORM = "wayland"; - environment.variables.QT_QPA_PLATFORMTHEME = "qt6ct"; - environment.variables.GTK_THEME = "Breeze"; -} From 5072843e6a76f4ae0cd8f1440a49b6e73901f599 Mon Sep 17 00:00:00 2001 From: lily Date: Thu, 26 Sep 2024 01:24:27 -0400 Subject: [PATCH 087/102] fix: fstab, unfree software setting --- home-manager/packages/packages.nix | 6 +++++- home-manager/packages/zsh.nix | 2 -- nixos/configuration.nix | 2 ++ nixos/environments/gnome.nix | 6 ++++-- nixos/hardware/fstab.nix | 4 ++-- nixos/services/services.nix | 2 ++ 6 files changed, 15 insertions(+), 7 deletions(-) diff --git a/home-manager/packages/packages.nix b/home-manager/packages/packages.nix index 38a387d..ed6fb5c 100644 --- a/home-manager/packages/packages.nix +++ b/home-manager/packages/packages.nix @@ -19,6 +19,10 @@ tor-browser nix-search-cli mpv - dolphin + element-desktop + mission-center + nvtop ]; + + nixpkgs.config.allowUnfree = true; } diff --git a/home-manager/packages/zsh.nix b/home-manager/packages/zsh.nix index 7fb3a98..cb60ef2 100644 --- a/home-manager/packages/zsh.nix +++ b/home-manager/packages/zsh.nix @@ -44,9 +44,7 @@ zstyle ':completion:*' matcher-list 'm:{a-z}={A-Za-z}' zstyle ':completion:*' menu no zstyle ':fzf-tab:complete:cd:*' fzf-preview 'ls --color $realpath' - zstyle ':fzf-tab:complete:__zoxide_z:*' fzf-preview 'ls --color $realpath' eval "$(fzf --zsh)" - eval "$(zoxide init --cmd cd zsh)" ''; }; diff --git a/nixos/configuration.nix b/nixos/configuration.nix index 918c017..b2ac280 100644 --- a/nixos/configuration.nix +++ b/nixos/configuration.nix @@ -12,6 +12,8 @@ ./misc/misc.nix ]; + nixpkgs.config.allowUnfree = true; + # Copy the NixOS configuration file and link it from the resulting system # (/run/current-system/configuration.nix). This is useful in case you # accidentally delete configuration.nix. diff --git a/nixos/environments/gnome.nix b/nixos/environments/gnome.nix index 09b3483..ce7d35f 100644 --- a/nixos/environments/gnome.nix +++ b/nixos/environments/gnome.nix @@ -1,7 +1,9 @@ { ... }: { - services.xserver.enable = false; + services.xserver.enable = true; + services.xserver.videoDrivers = ["nvidia"]; services.xserver.displayManager.gdm.enable = true; + services.xserver.displayManager.gdm.wayland = true; services.xserver.desktopManager.gnome.enable = true; -} \ No newline at end of file +} diff --git a/nixos/hardware/fstab.nix b/nixos/hardware/fstab.nix index 321df02..b8cbc26 100644 --- a/nixos/hardware/fstab.nix +++ b/nixos/hardware/fstab.nix @@ -2,12 +2,12 @@ { fileSystems."/" = - { device = "/dev/disk/by-uuid/6f9a4486-8f14-468f-aecb-5e0df8af2309"; + { device = "/dev/disk/by-uuid/afce32c1-67df-4324-aebb-a113b71317b9"; fsType = "ext4"; }; fileSystems."/boot" = - { device = "/dev/disk/by-uuid/4A4B-5B94"; + { device = "/dev/disk/by-uuid/12CE-A600"; fsType = "vfat"; options = [ "fmask=0022" "dmask=0022" ]; }; diff --git a/nixos/services/services.nix b/nixos/services/services.nix index 25567fb..406d113 100644 --- a/nixos/services/services.nix +++ b/nixos/services/services.nix @@ -10,4 +10,6 @@ ./libinput.nix ./networkmanager.nix ]; + + services.flatpak.enable = true; } From 9740a6b4609e66fd7e483d33a239630c6415796e Mon Sep 17 00:00:00 2001 From: lily Date: Thu, 26 Sep 2024 01:36:59 -0400 Subject: [PATCH 088/102] add: allowed signers file path --- home-manager/packages/git.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/home-manager/packages/git.nix b/home-manager/packages/git.nix index 443166f..33b4d21 100644 --- a/home-manager/packages/git.nix +++ b/home-manager/packages/git.nix @@ -16,6 +16,7 @@ extraConfig = { init.defaultBranch = "main"; gpg.format = "ssh"; + gpg.ssh.allowedSignersFile = "/home/luxzi/.ssh/allowed_signers"; core.symlinks = true; }; }; From 24162ced3363d119170a95c65eb0f07bb432e8e2 Mon Sep 17 00:00:00 2001 From: lily Date: Thu, 26 Sep 2024 16:28:53 -0400 Subject: [PATCH 089/102] add: starship prompt --- home-manager/packages/zsh.nix | 133 +++++++++++----------------------- 1 file changed, 44 insertions(+), 89 deletions(-) diff --git a/home-manager/packages/zsh.nix b/home-manager/packages/zsh.nix index cb60ef2..956dd25 100644 --- a/home-manager/packages/zsh.nix +++ b/home-manager/packages/zsh.nix @@ -48,97 +48,52 @@ ''; }; - programs.oh-my-posh = { + programs.starship = { enable = true; - enableZshIntegration = true; settings = { - "$schema" = "https://raw.githubusercontent.com/JanDeDobbeleer/oh-my-posh/main/themes/schema.json"; - palette = { - os = "#ACB0BE"; - pink = "#F5BDE6"; - lavender = "#B7BDF8"; - blue = "#8AADF4"; - white = "#FFFFFF"; - text = "#494D64"; - }; - blocks = [ - { - alignment = "left"; - newline = true; - segments = [ - { - background = "p:blue"; - foreground = "p:white"; - powerline_symbol = builtins.fromJSON '' "\ue0b4" ''; - leading_diamond = builtins.fromJSON '' "\ue0b6" ''; - style = "diamond"; - template = "{{.Icon}} "; - type = "os"; - } - { - background = "p:blue"; - foreground = "p:text"; - powerline_symbol = builtins.fromJSON '' "\ue0b4" ''; - style = "diamond"; - template = "{{ .UserName }}@{{ .HostName }}"; - type = "session"; - } - { - background = "p:pink"; - foreground = "p:text"; - properties = { - folder_icon = "..\ue5fe.."; - home_icon = "~"; - style = "folder"; - }; - powerline_symbol = builtins.fromJSON '' "\ue0b4" ''; - style = "powerline"; - template = builtins.fromJSON '' " \udb81\udf70 {{ .Path }}" ''; - type = "path"; - } - { - background = "p:blue"; - foreground = "p:text"; - powerline_symbol = builtins.fromJSON '' "\ue0b4" ''; - template = builtins.fromJSON '' "{{if .Env.IN_NIX_SHELL}} \uf313 in nix-shell{{else}}{{end}}" ''; - style = "diamond"; - type = "text"; - } - { - background = "p:lavender"; - foreground = "p:text"; - style = "powerline"; - properties = { - branch_icon = builtins.fromJSON '' "\ue725 " ''; - cherry_pick_icon = builtins.fromJSON '' "\ue29b " ''; - commit_icon = builtins.fromJSON '' "\uf417 " ''; - fetch_status = true; - fetch_upstream_icon = true; - fetch_bare_info = true; - merge_icon = builtins.fromJSON '' "\ue727 " ''; - no_commits_icon = builtins.fromJSON '' "\uf0c3 " ''; - rebase_icon = builtins.fromJSON '' "\ue728 " ''; - revert_icon = builtins.fromJSON '' "\uf0e2 " ''; - tag_icon = builtins.fromJSON '' "\uf412 " ''; - }; - powerline_symbol = builtins.fromJSON '' "\ue0b4" ''; - template = " {{ .HEAD }}{{ .Working }}"; - type = "git"; - } - { - background = "#f38ba8"; - foreground = "p:text"; - powerline_symbol = builtins.fromJSON '' "\ue0b4" ''; - template = builtins.fromJSON '' "{{if eq .Code 0}}{{else}} \uea87 {{.Code}}<#f38ba8,transparent>\ue0b4{{end}}" ''; - type = "status"; - style = "diamond"; - } - ]; - type = "prompt"; - } - ]; - final_space = true; - version = 2; + format = "$username$hostname$directory$git_branch$git_state$git_status$nix_shell$cmd_duration$line_break$python$character"; + + directory = { + style = "blue"; + }; + + character = { + success_symbol = "[❯](white)"; + error_symbol = "[❯](red)"; + vimcmd_symbol = "[❮](green)"; + }; + + git_branch = { + format = "[$branch]($style)"; + style = "green"; + }; + + git_status = { + format = "[[($conflicted$untracked$modified$staged$renamed$deleted)](218) ($ahead_behind$stashed)]($style)"; + style = "cyan"; + conflicted = "!"; + untracked = "​u"; + modified = "​*"; + staged = "​+"; + renamed = "r"; + deleted = "d"; + stashed = "≡"; + }; + + git_state = { + format = "\([$state( $progress_current/$progress_total)]($style)\) "; + style = "bright-black"; + }; + + cmd_duration = { + format = "[$duration]($style) "; + style = "yellow"; + }; + + python = { + format = "[$virtualenv]($style) "; + style = "bright-black"; }; }; + }; } From 37a31abc4fc05e212125b928d9731d48777e145e Mon Sep 17 00:00:00 2001 From: lily Date: Thu, 26 Sep 2024 17:06:24 -0400 Subject: [PATCH 090/102] fix: use gpg signing --- home-manager/packages/git.nix | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/home-manager/packages/git.nix b/home-manager/packages/git.nix index 33b4d21..707417f 100644 --- a/home-manager/packages/git.nix +++ b/home-manager/packages/git.nix @@ -10,14 +10,13 @@ kl = "log --show-signature"; }; signing = { - key = "/home/luxzi/.ssh/luxzi"; + key = "C90237A70F2FDD53"; signByDefault = true; }; extraConfig = { init.defaultBranch = "main"; - gpg.format = "ssh"; - gpg.ssh.allowedSignersFile = "/home/luxzi/.ssh/allowed_signers"; core.symlinks = true; + commit.gpgsign = true; }; }; } From c7aef3e55bc67f8265d3ea356be4eb87533322d5 Mon Sep 17 00:00:00 2001 From: lily Date: Fri, 11 Oct 2024 22:25:08 -0400 Subject: [PATCH 091/102] add: alacritty --- home-manager/packages/packages.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/home-manager/packages/packages.nix b/home-manager/packages/packages.nix index ed6fb5c..51fe1b6 100644 --- a/home-manager/packages/packages.nix +++ b/home-manager/packages/packages.nix @@ -22,6 +22,7 @@ element-desktop mission-center nvtop + alacritty ]; nixpkgs.config.allowUnfree = true; From 52120b2ffbedc30e617306243656c505df82bb4f Mon Sep 17 00:00:00 2001 From: lily Date: Sun, 26 Jan 2025 17:54:55 -0500 Subject: [PATCH 092/102] fix: outdated package names --- flake.lock | 39 ++++++++++++++++++++++-------- home-manager/packages/kitty.nix | 3 +-- home-manager/packages/packages.nix | 1 + nixos/configuration.nix | 4 +-- nixos/programs/programs.nix | 2 +- 5 files changed, 34 insertions(+), 15 deletions(-) diff --git a/flake.lock b/flake.lock index 9d35b51..793d90f 100644 --- a/flake.lock +++ b/flake.lock @@ -1,12 +1,15 @@ { "nodes": { "catppuccin": { + "inputs": { + "nixpkgs": "nixpkgs" + }, "locked": { - "lastModified": 1721784420, - "narHash": "sha256-bgF6fN4Qgk7NErFKGuuqWXcLORsiykTYyqMUFRiAUBY=", + "lastModified": 1737579274, + "narHash": "sha256-8kBIYfn8TI9jbffhDNS12SdbQHb9ITXflwcgIJBeGqw=", "owner": "catppuccin", "repo": "nix", - "rev": "8bdb55cc1c13f572b6e4307a3c0d64f1ae286a4f", + "rev": "06f0ea19334bcc8112e6d671fd53e61f9e3ad63a", "type": "github" }, "original": { @@ -22,11 +25,11 @@ ] }, "locked": { - "lastModified": 1721804110, - "narHash": "sha256-i4jINRazBKPqlaS+qhlP+kV/UHEq3vs5itfpblqu4ZM=", + "lastModified": 1737762889, + "narHash": "sha256-5HGG09bh/Yx0JA8wtBMAzt0HMCL1bYZ93x4IqzVExio=", "owner": "nix-community", "repo": "home-manager", - "rev": "af70fc502a15d7e1e4c5a4c4fc8e06c2ec561e0c", + "rev": "daf04c5950b676f47a794300657f1d3d14c1a120", "type": "github" }, "original": { @@ -37,11 +40,27 @@ }, "nixpkgs": { "locked": { - "lastModified": 1721562059, - "narHash": "sha256-Tybxt65eyOARf285hMHIJ2uul8SULjFZbT9ZaEeUnP8=", + "lastModified": 1736012469, + "narHash": "sha256-/qlNWm/IEVVH7GfgAIyP6EsVZI6zjAx1cV5zNyrs+rI=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "68c9ed8bbed9dfce253cc91560bf9043297ef2fe", + "rev": "8f3e1f807051e32d8c95cd12b9b421623850a34d", + "type": "github" + }, + "original": { + "owner": "NixOS", + "ref": "nixos-unstable", + "repo": "nixpkgs", + "type": "github" + } + }, + "nixpkgs_2": { + "locked": { + "lastModified": 1737885589, + "narHash": "sha256-Zf0hSrtzaM1DEz8//+Xs51k/wdSajticVrATqDrfQjg=", + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "852ff1d9e153d8875a83602e03fdef8a63f0ecf8", "type": "github" }, "original": { @@ -55,7 +74,7 @@ "inputs": { "catppuccin": "catppuccin", "home-manager": "home-manager", - "nixpkgs": "nixpkgs" + "nixpkgs": "nixpkgs_2" } } }, diff --git a/home-manager/packages/kitty.nix b/home-manager/packages/kitty.nix index ac34fa4..b071f86 100644 --- a/home-manager/packages/kitty.nix +++ b/home-manager/packages/kitty.nix @@ -3,10 +3,9 @@ { programs.kitty = { enable = true; - theme = "Catppuccin-Mocha"; font = { name = "FiraCode Nerd Font"; - package = pkgs.fira-code-nerdfont; + package = pkgs.nerd-fonts.fira-code; size = 14; }; settings = { diff --git a/home-manager/packages/packages.nix b/home-manager/packages/packages.nix index 51fe1b6..eefd3b9 100644 --- a/home-manager/packages/packages.nix +++ b/home-manager/packages/packages.nix @@ -23,6 +23,7 @@ mission-center nvtop alacritty + nerd-fonts.fira-code ]; nixpkgs.config.allowUnfree = true; diff --git a/nixos/configuration.nix b/nixos/configuration.nix index b2ac280..0984d3f 100644 --- a/nixos/configuration.nix +++ b/nixos/configuration.nix @@ -4,8 +4,8 @@ imports = [ # Include the results of the hardware scan. ./hardware/hardware.nix - # ./environments/plasma-wayland.nix - ./environments/gnome.nix + ./environments/plasma-wayland.nix + # ./environments/gnome.nix ./users/luxzi.nix ./services/services.nix ./programs/programs.nix diff --git a/nixos/programs/programs.nix b/nixos/programs/programs.nix index 68581da..6b2b27c 100644 --- a/nixos/programs/programs.nix +++ b/nixos/programs/programs.nix @@ -14,7 +14,7 @@ curl git neovim - fira-code-nerdfont + nerd-fonts.fira-code cmake ninja libgcc From 74c78e1c684cbbf3da48945e1cbf1fbc62a8e244 Mon Sep 17 00:00:00 2001 From: lily Date: Sun, 26 Jan 2025 18:11:55 -0500 Subject: [PATCH 093/102] fix: correctly catagorize pulseaudio --- nixos/hardware/audio.nix | 5 ----- nixos/services/audio.nix | 5 +++++ 2 files changed, 5 insertions(+), 5 deletions(-) delete mode 100644 nixos/hardware/audio.nix create mode 100644 nixos/services/audio.nix diff --git a/nixos/hardware/audio.nix b/nixos/hardware/audio.nix deleted file mode 100644 index 82ca1fa..0000000 --- a/nixos/hardware/audio.nix +++ /dev/null @@ -1,5 +0,0 @@ -{ ... }: - -{ - hardware.pulseaudio.enable = false; -} diff --git a/nixos/services/audio.nix b/nixos/services/audio.nix new file mode 100644 index 0000000..268a81c --- /dev/null +++ b/nixos/services/audio.nix @@ -0,0 +1,5 @@ +{ ... }: + +{ + services.pulseaudio.enable = false; +} From f40517cff10a29b3eeb0ea4bc1b8b1390e99d593 Mon Sep 17 00:00:00 2001 From: Chance Date: Sat, 29 Mar 2025 21:03:07 -0400 Subject: [PATCH 094/102] add core configuration --- .gitignore | 1 + LICENSE | 19 -- README.md | 40 --- bootstrap.sh | 5 - flake.lock | 320 ++++++++++++++++-- flake.nix | 135 ++++++-- home-manager/home.nix | 14 - home-manager/modules/chromium/default.nix | 27 ++ home-manager/modules/ghostty/default.nix | 37 ++ home-manager/modules/ghostty/shaders/crt.glsl | 153 +++++++++ .../modules/ghostty/shaders/glow.glsl | 145 ++++++++ home-manager/modules/git/default.nix | 33 ++ home-manager/modules/hyprland/default.nix | 116 +++++++ home-manager/modules/neovim/colorscheme.nix | 42 +++ home-manager/modules/neovim/default.nix | 32 ++ home-manager/modules/neovim/keybinds.nix | 32 ++ .../modules/neovim/plugins/default.nix | 24 ++ .../modules/neovim/plugins/gitsigns.nix | 45 +++ .../modules/neovim/plugins/lsp/cmp.nix | 85 +++++ .../modules/neovim/plugins/lsp/default.nix | 192 +++++++++++ .../modules/neovim/plugins/lualine.nix | 21 ++ .../modules/neovim/plugins/telescope.nix | 47 +++ home-manager/modules/neovim/plugins/tree.nix | 17 + .../modules/neovim/plugins/treesitter.nix | 19 ++ home-manager/modules/rofi/default.nix | 20 ++ home-manager/modules/vscode/default.nix | 84 +++++ home-manager/modules/waybar/default.nix | 18 + home-manager/modules/zed/default.nix | 103 ++++++ home-manager/modules/zsh/default.nix | 53 +++ home-manager/nix/home.nix | 85 +++++ .../packages/doom-emacs/.doom.d/config.el | 100 ------ .../packages/doom-emacs/.doom.d/custom.el | 13 - .../packages/doom-emacs/.doom.d/init.el | 191 ----------- .../packages/doom-emacs/.doom.d/packages.el | 63 ---- home-manager/packages/doom-emacs/.gitignore | 1 - home-manager/packages/emacs.nix | 23 -- home-manager/packages/git.nix | 22 -- home-manager/packages/kitty.nix | 17 - home-manager/packages/packages.nix | 30 -- home-manager/packages/zsh.nix | 99 ------ home-manager/profiles/desktop.nix | 22 ++ home-manager/profiles/main.nix | 10 + machines/nix/configuration.nix | 79 +++++ machines/nix/hardware-configuration.nix | 45 +++ machines/nix/plymouth.nix | 31 ++ modules/common/common.nix | 47 +++ modules/common/default.nix | 17 + modules/common/desktop.nix | 82 +++++ modules/common/locale.nix | 18 + modules/common/nixcommon.nix | 49 +++ modules/containers/default.nix | 48 +++ modules/fileshare/default.nix | 17 + modules/fileshare/samba.nix | 55 +++ modules/hardware/default.nix | 17 + modules/hardware/laptop.nix | 33 ++ modules/hardware/nvidia.nix | 67 ++++ modules/hyprland/default.nix | 141 ++++++++ modules/plasma/default.nix | 18 + modules/runners/default.nix | 32 ++ modules/runners/secrets/lily.age | 7 + modules/runners/secrets/potato.age | Bin 0 -> 369 bytes modules/runners/secrets/secrets.nix | 19 ++ modules/users/default.nix | 17 + modules/users/lily.nix | 21 ++ modules/wayland/default.nix | 37 ++ nixos/configuration.nix | 28 -- nixos/environments/gnome.nix | 9 - nixos/environments/plasma-wayland.nix | 14 - nixos/hardware/fstab.nix | 14 - nixos/hardware/hardware.nix | 13 - nixos/hardware/intel.nix | 6 - nixos/hardware/modules.nix | 13 - nixos/hardware/network.nix | 5 - nixos/hardware/nvidia.nix | 13 - nixos/misc/locale.nix | 5 - nixos/misc/misc.nix | 10 - nixos/misc/nixconfig.nix | 6 - nixos/misc/time.nix | 5 - nixos/programs/dconf.nix | 5 - nixos/programs/gpg.nix | 8 - nixos/programs/nix-ld.nix | 8 - nixos/programs/programs.nix | 36 -- nixos/programs/steam.nix | 5 - nixos/services/audio.nix | 5 - nixos/services/boot.nix | 9 - nixos/services/cups.nix | 5 - nixos/services/firewall.nix | 7 - nixos/services/libinput.nix | 5 - nixos/services/networkmanager.nix | 6 - nixos/services/pipewire.nix | 11 - nixos/services/services.nix | 15 - nixos/users/luxzi.nix | 15 - overlays/default.nix | 37 ++ pkgs/default.nix | 5 + 94 files changed, 2816 insertions(+), 959 deletions(-) create mode 100644 .gitignore delete mode 100644 LICENSE delete mode 100644 README.md delete mode 100644 bootstrap.sh delete mode 100644 home-manager/home.nix create mode 100644 home-manager/modules/chromium/default.nix create mode 100644 home-manager/modules/ghostty/default.nix create mode 100644 home-manager/modules/ghostty/shaders/crt.glsl create mode 100644 home-manager/modules/ghostty/shaders/glow.glsl create mode 100644 home-manager/modules/git/default.nix create mode 100644 home-manager/modules/hyprland/default.nix create mode 100644 home-manager/modules/neovim/colorscheme.nix create mode 100644 home-manager/modules/neovim/default.nix create mode 100644 home-manager/modules/neovim/keybinds.nix create mode 100644 home-manager/modules/neovim/plugins/default.nix create mode 100644 home-manager/modules/neovim/plugins/gitsigns.nix create mode 100644 home-manager/modules/neovim/plugins/lsp/cmp.nix create mode 100644 home-manager/modules/neovim/plugins/lsp/default.nix create mode 100644 home-manager/modules/neovim/plugins/lualine.nix create mode 100644 home-manager/modules/neovim/plugins/telescope.nix create mode 100644 home-manager/modules/neovim/plugins/tree.nix create mode 100644 home-manager/modules/neovim/plugins/treesitter.nix create mode 100644 home-manager/modules/rofi/default.nix create mode 100644 home-manager/modules/vscode/default.nix create mode 100644 home-manager/modules/waybar/default.nix create mode 100644 home-manager/modules/zed/default.nix create mode 100644 home-manager/modules/zsh/default.nix create mode 100644 home-manager/nix/home.nix delete mode 100644 home-manager/packages/doom-emacs/.doom.d/config.el delete mode 100644 home-manager/packages/doom-emacs/.doom.d/custom.el delete mode 100644 home-manager/packages/doom-emacs/.doom.d/init.el delete mode 100644 home-manager/packages/doom-emacs/.doom.d/packages.el delete mode 100644 home-manager/packages/doom-emacs/.gitignore delete mode 100644 home-manager/packages/emacs.nix delete mode 100644 home-manager/packages/git.nix delete mode 100644 home-manager/packages/kitty.nix delete mode 100644 home-manager/packages/packages.nix delete mode 100644 home-manager/packages/zsh.nix create mode 100644 home-manager/profiles/desktop.nix create mode 100644 home-manager/profiles/main.nix create mode 100644 machines/nix/configuration.nix create mode 100644 machines/nix/hardware-configuration.nix create mode 100644 machines/nix/plymouth.nix create mode 100644 modules/common/common.nix create mode 100644 modules/common/default.nix create mode 100644 modules/common/desktop.nix create mode 100644 modules/common/locale.nix create mode 100644 modules/common/nixcommon.nix create mode 100644 modules/containers/default.nix create mode 100644 modules/fileshare/default.nix create mode 100644 modules/fileshare/samba.nix create mode 100644 modules/hardware/default.nix create mode 100644 modules/hardware/laptop.nix create mode 100644 modules/hardware/nvidia.nix create mode 100644 modules/hyprland/default.nix create mode 100644 modules/plasma/default.nix create mode 100644 modules/runners/default.nix create mode 100644 modules/runners/secrets/lily.age create mode 100644 modules/runners/secrets/potato.age create mode 100644 modules/runners/secrets/secrets.nix create mode 100644 modules/users/default.nix create mode 100644 modules/users/lily.nix create mode 100644 modules/wayland/default.nix delete mode 100644 nixos/configuration.nix delete mode 100644 nixos/environments/gnome.nix delete mode 100644 nixos/environments/plasma-wayland.nix delete mode 100644 nixos/hardware/fstab.nix delete mode 100644 nixos/hardware/hardware.nix delete mode 100644 nixos/hardware/intel.nix delete mode 100644 nixos/hardware/modules.nix delete mode 100644 nixos/hardware/network.nix delete mode 100644 nixos/hardware/nvidia.nix delete mode 100644 nixos/misc/locale.nix delete mode 100644 nixos/misc/misc.nix delete mode 100644 nixos/misc/nixconfig.nix delete mode 100644 nixos/misc/time.nix delete mode 100644 nixos/programs/dconf.nix delete mode 100644 nixos/programs/gpg.nix delete mode 100644 nixos/programs/nix-ld.nix delete mode 100644 nixos/programs/programs.nix delete mode 100644 nixos/programs/steam.nix delete mode 100644 nixos/services/audio.nix delete mode 100644 nixos/services/boot.nix delete mode 100644 nixos/services/cups.nix delete mode 100644 nixos/services/firewall.nix delete mode 100644 nixos/services/libinput.nix delete mode 100644 nixos/services/networkmanager.nix delete mode 100644 nixos/services/pipewire.nix delete mode 100644 nixos/services/services.nix delete mode 100644 nixos/users/luxzi.nix create mode 100644 overlays/default.nix create mode 100644 pkgs/default.nix diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..03bd412 --- /dev/null +++ b/.gitignore @@ -0,0 +1 @@ +*.env diff --git a/LICENSE b/LICENSE deleted file mode 100644 index 93972a0..0000000 --- a/LICENSE +++ /dev/null @@ -1,19 +0,0 @@ -Copyright (c) 2024 Luxzi - -Permission is hereby granted, free of charge, to any person obtaining a copy -of this software and associated documentation files (the "Software"), to deal -in the Software without restriction, including without limitation the rights -to use, copy, modify, merge, publish, distribute, sublicense, and/or sell -copies of the Software, and to permit persons to whom the Software is -furnished to do so, subject to the following conditions: - -The above copyright notice and this permission notice shall be included in all -copies or substantial portions of the Software. - -THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR -IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, -FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE -AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER -LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, -OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE -SOFTWARE. diff --git a/README.md b/README.md deleted file mode 100644 index 2e54a8a..0000000 --- a/README.md +++ /dev/null @@ -1,40 +0,0 @@ -# NixOS configuration files - -Configured for KDE Plasma Wayland on Nvidia. - -## Customizing user settings - -To change your username or any additional user settings, you must: - -- Create `./nixos/users/.nix`, this can be copied from `luxzi.nix` in the same directory. -- Import the newly created file in `./nixos/configuration.nix`. -- Edit `./home-manager/home.nix` to the corresponding username and home directory. - -## Adjusting hardware configuration - -> [!NOTE] -> If you use an older Nvidia graphics card (i.e. before RTX 20 series), you do not need to modify `./nixos/hardware/nvidia.nix`. -> Although if you use a newer Nvidia graphics card, it is advised to enable `open` to use the open-source kernel driver. - -To use AMD graphics cards: - -- Create `./nixos/hardware/amd.nix` -- Add `services.xserver.videoDrivers = [ "amdgpu" ];` - -## Deployment - -If you would like to use these configuration files as is: - -- Mount and format desired filesystems (as described in the NixOS manual). -- Run the following git clone command while also making sure to replace `` with your desired username: -``` sh -git clone git@codeberg.org:luxzi/nixos /mnt/home//.dotfiles -``` -- Make any desired changes. -- Install the system with the command below, again, making sure to replace `` with your desired username: -``` sh -nixos-install --flake /mnt/home//.dotfiles -``` - -For more modified versions of this configuration, I recommend forking this repository. - diff --git a/bootstrap.sh b/bootstrap.sh deleted file mode 100644 index 09296e2..0000000 --- a/bootstrap.sh +++ /dev/null @@ -1,5 +0,0 @@ -#!/bin/sh - -nix-channel --add https://nixos.org/channels/nixos-unstable nixos -nixos-rebuild switch --upgrade -nixos-install --flake /mnt/home/luxzi/.dotfiles diff --git a/flake.lock b/flake.lock index 793d90f..f732535 100644 --- a/flake.lock +++ b/flake.lock @@ -1,35 +1,118 @@ { "nodes": { - "catppuccin": { + "agenix": { "inputs": { - "nixpkgs": "nixpkgs" + "darwin": "darwin", + "home-manager": "home-manager", + "nixpkgs": "nixpkgs", + "systems": "systems" }, "locked": { - "lastModified": 1737579274, - "narHash": "sha256-8kBIYfn8TI9jbffhDNS12SdbQHb9ITXflwcgIJBeGqw=", - "owner": "catppuccin", - "repo": "nix", - "rev": "06f0ea19334bcc8112e6d671fd53e61f9e3ad63a", + "lastModified": 1736955230, + "narHash": "sha256-uenf8fv2eG5bKM8C/UvFaiJMZ4IpUFaQxk9OH5t/1gA=", + "owner": "ryantm", + "repo": "agenix", + "rev": "e600439ec4c273cf11e06fe4d9d906fb98fa097c", "type": "github" }, "original": { - "owner": "catppuccin", - "repo": "nix", + "owner": "ryantm", + "repo": "agenix", + "type": "github" + } + }, + "darwin": { + "inputs": { + "nixpkgs": [ + "agenix", + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1700795494, + "narHash": "sha256-gzGLZSiOhf155FW7262kdHo2YDeugp3VuIFb4/GGng0=", + "owner": "lnl7", + "repo": "nix-darwin", + "rev": "4b9b83d5a92e8c1fbfd8eb27eda375908c11ec4d", + "type": "github" + }, + "original": { + "owner": "lnl7", + "ref": "master", + "repo": "nix-darwin", + "type": "github" + } + }, + "flake-parts": { + "inputs": { + "nixpkgs-lib": "nixpkgs-lib" + }, + "locked": { + "lastModified": 1741352980, + "narHash": "sha256-+u2UunDA4Cl5Fci3m7S643HzKmIDAe+fiXrLqYsR2fs=", + "owner": "hercules-ci", + "repo": "flake-parts", + "rev": "f4330d22f1c5d2ba72d3d22df5597d123fdb60a9", + "type": "github" + }, + "original": { + "owner": "hercules-ci", + "repo": "flake-parts", + "type": "github" + } + }, + "flake-parts_2": { + "inputs": { + "nixpkgs-lib": [ + "nixvim", + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1741352980, + "narHash": "sha256-+u2UunDA4Cl5Fci3m7S643HzKmIDAe+fiXrLqYsR2fs=", + "owner": "hercules-ci", + "repo": "flake-parts", + "rev": "f4330d22f1c5d2ba72d3d22df5597d123fdb60a9", + "type": "github" + }, + "original": { + "owner": "hercules-ci", + "repo": "flake-parts", + "type": "github" + } + }, + "flake-utils": { + "inputs": { + "systems": "systems_2" + }, + "locked": { + "lastModified": 1731533236, + "narHash": "sha256-l0KFg5HjrsfsO/JpG+r7fRrqm12kzFHyUHqHCVpMMbI=", + "owner": "numtide", + "repo": "flake-utils", + "rev": "11707dc2f618dd54ca8739b309ec4fc024de578b", + "type": "github" + }, + "original": { + "owner": "numtide", + "repo": "flake-utils", "type": "github" } }, "home-manager": { "inputs": { "nixpkgs": [ + "agenix", "nixpkgs" ] }, "locked": { - "lastModified": 1737762889, - "narHash": "sha256-5HGG09bh/Yx0JA8wtBMAzt0HMCL1bYZ93x4IqzVExio=", + "lastModified": 1703113217, + "narHash": "sha256-7ulcXOk63TIT2lVDSExj7XzFx09LpdSAPtvgtM7yQPE=", "owner": "nix-community", "repo": "home-manager", - "rev": "daf04c5950b676f47a794300657f1d3d14c1a120", + "rev": "3bfaacf46133c037bb356193bd2f1765d9dc82c1", "type": "github" }, "original": { @@ -38,13 +121,81 @@ "type": "github" } }, + "home-manager_2": { + "inputs": { + "nixpkgs": [ + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1742234739, + "narHash": "sha256-zFL6zsf/5OztR1NSNQF33dvS1fL/BzVUjabZq4qrtY4=", + "owner": "nix-community", + "repo": "home-manager", + "rev": "f6af7280a3390e65c2ad8fd059cdc303426cbd59", + "type": "github" + }, + "original": { + "owner": "nix-community", + "ref": "release-24.11", + "repo": "home-manager", + "type": "github" + } + }, + "ixx": { + "inputs": { + "flake-utils": [ + "nixvim", + "nuschtosSearch", + "flake-utils" + ], + "nixpkgs": [ + "nixvim", + "nuschtosSearch", + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1729958008, + "narHash": "sha256-EiOq8jF4Z/zQe0QYVc3+qSKxRK//CFHMB84aYrYGwEs=", + "owner": "NuschtOS", + "repo": "ixx", + "rev": "9fd01aad037f345350eab2cd45e1946cc66da4eb", + "type": "github" + }, + "original": { + "owner": "NuschtOS", + "ref": "v0.0.6", + "repo": "ixx", + "type": "github" + } + }, + "nix-gaming": { + "inputs": { + "flake-parts": "flake-parts", + "nixpkgs": "nixpkgs_2" + }, + "locked": { + "lastModified": 1742262357, + "narHash": "sha256-6JGR5I4cuFFun3AJKPnMPz6PKUPywIH+AFYROUFRvYQ=", + "owner": "fufexan", + "repo": "nix-gaming", + "rev": "53eda8bba79a2c28782734bca51d70ecffb82d74", + "type": "github" + }, + "original": { + "owner": "fufexan", + "repo": "nix-gaming", + "type": "github" + } + }, "nixpkgs": { "locked": { - "lastModified": 1736012469, - "narHash": "sha256-/qlNWm/IEVVH7GfgAIyP6EsVZI6zjAx1cV5zNyrs+rI=", + "lastModified": 1703013332, + "narHash": "sha256-+tFNwMvlXLbJZXiMHqYq77z/RfmpfpiI3yjL6o/Zo9M=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "8f3e1f807051e32d8c95cd12b9b421623850a34d", + "rev": "54aac082a4d9bb5bbc5c4e899603abfb76a3f6d6", "type": "github" }, "original": { @@ -54,27 +205,152 @@ "type": "github" } }, + "nixpkgs-lib": { + "locked": { + "lastModified": 1740877520, + "narHash": "sha256-oiwv/ZK/2FhGxrCkQkB83i7GnWXPPLzoqFHpDD3uYpk=", + "owner": "nix-community", + "repo": "nixpkgs.lib", + "rev": "147dee35aab2193b174e4c0868bd80ead5ce755c", + "type": "github" + }, + "original": { + "owner": "nix-community", + "repo": "nixpkgs.lib", + "type": "github" + } + }, + "nixpkgs-unstable": { + "locked": { + "lastModified": 1742288794, + "narHash": "sha256-Txwa5uO+qpQXrNG4eumPSD+hHzzYi/CdaM80M9XRLCo=", + "owner": "nixos", + "repo": "nixpkgs", + "rev": "b6eaf97c6960d97350c584de1b6dcff03c9daf42", + "type": "github" + }, + "original": { + "owner": "nixos", + "ref": "nixos-unstable", + "repo": "nixpkgs", + "type": "github" + } + }, "nixpkgs_2": { "locked": { - "lastModified": 1737885589, - "narHash": "sha256-Zf0hSrtzaM1DEz8//+Xs51k/wdSajticVrATqDrfQjg=", + "lastModified": 1741865919, + "narHash": "sha256-4thdbnP6dlbdq+qZWTsm4ffAwoS8Tiq1YResB+RP6WE=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "852ff1d9e153d8875a83602e03fdef8a63f0ecf8", + "rev": "573c650e8a14b2faa0041645ab18aed7e60f0c9a", "type": "github" }, "original": { "owner": "NixOS", - "ref": "nixos-unstable", + "ref": "nixpkgs-unstable", "repo": "nixpkgs", "type": "github" } }, + "nixpkgs_3": { + "locked": { + "lastModified": 1742268799, + "narHash": "sha256-IhnK4LhkBlf14/F8THvUy3xi/TxSQkp9hikfDZRD4Ic=", + "owner": "nixos", + "repo": "nixpkgs", + "rev": "da044451c6a70518db5b730fe277b70f494188f1", + "type": "github" + }, + "original": { + "owner": "nixos", + "ref": "nixos-24.11", + "repo": "nixpkgs", + "type": "github" + } + }, + "nixvim": { + "inputs": { + "flake-parts": "flake-parts_2", + "nixpkgs": [ + "nixpkgs" + ], + "nuschtosSearch": "nuschtosSearch" + }, + "locked": { + "lastModified": 1742396414, + "narHash": "sha256-e9Uv44rVDAG2ohNejttl9Pq5r4dxIzWxt+1hvKTQK5E=", + "owner": "nix-community", + "repo": "nixvim", + "rev": "d79c291d5d80d587d518e0f530cc55adb0638c80", + "type": "github" + }, + "original": { + "owner": "nix-community", + "repo": "nixvim", + "type": "github" + } + }, + "nuschtosSearch": { + "inputs": { + "flake-utils": "flake-utils", + "ixx": "ixx", + "nixpkgs": [ + "nixvim", + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1741886583, + "narHash": "sha256-sScfYKtxp3CYv5fJcHQDvQjqBL+tPNQqS9yf9Putd+s=", + "owner": "NuschtOS", + "repo": "search", + "rev": "2974bc5fa3441a319fba943f3ca41f7dcd1a1467", + "type": "github" + }, + "original": { + "owner": "NuschtOS", + "repo": "search", + "type": "github" + } + }, "root": { "inputs": { - "catppuccin": "catppuccin", - "home-manager": "home-manager", - "nixpkgs": "nixpkgs_2" + "agenix": "agenix", + "home-manager": "home-manager_2", + "nix-gaming": "nix-gaming", + "nixpkgs": "nixpkgs_3", + "nixpkgs-unstable": "nixpkgs-unstable", + "nixvim": "nixvim" + } + }, + "systems": { + "locked": { + "lastModified": 1681028828, + "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=", + "owner": "nix-systems", + "repo": "default", + "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e", + "type": "github" + }, + "original": { + "owner": "nix-systems", + "repo": "default", + "type": "github" + } + }, + "systems_2": { + "locked": { + "lastModified": 1681028828, + "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=", + "owner": "nix-systems", + "repo": "default", + "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e", + "type": "github" + }, + "original": { + "owner": "nix-systems", + "repo": "default", + "type": "github" } } }, diff --git a/flake.nix b/flake.nix index 168f604..ed0a138 100644 --- a/flake.nix +++ b/flake.nix @@ -1,30 +1,127 @@ { - description = "Luxzi's NixOS system configuration"; + description = "Your new nix config"; inputs = { - nixpkgs.url = "github:NixOS/nixpkgs/nixos-unstable"; - home-manager.url = "github:nix-community/home-manager"; + # Nixpkgs + nixpkgs.url = "github:nixos/nixpkgs/nixos-24.11"; + # You can access packages and modules from different nixpkgs revs + # at the same time. Here's an working example: + nixpkgs-unstable.url = "github:nixos/nixpkgs/nixos-unstable"; + # Also see the 'unstable-packages' overlay at 'overlays/default.nix'. + # Home manager home-manager.inputs.nixpkgs.follows = "nixpkgs"; - - catppuccin.url = "github:catppuccin/nix"; + home-manager.url = "github:nix-community/home-manager/release-24.11"; + agenix.url = "github:ryantm/agenix"; + nixvim.url = "github:nix-community/nixvim"; + nixvim.inputs.nixpkgs.follows = "nixpkgs"; + nix-gaming.url = "github:fufexan/nix-gaming"; }; - outputs = { self, nixpkgs, home-manager, catppuccin, ... }: - let - lib = nixpkgs.lib; - pkgs = nixpkgs.legacyPackages."x86_64-linux"; - in { - nixosConfigurations = { - nixos = lib.nixosSystem { - specialArgs = { inherit self; }; - modules = [ ./nixos/configuration.nix catppuccin.nixosModules.catppuccin ]; + outputs = { + self, + nixpkgs, + home-manager, + agenix, + nixvim, + ... + } @ inputs: let + inherit (self) outputs; + # Supported systems for your flake packages, shell, etc. + systems = [ + "aarch64-linux" + "i686-linux" + "x86_64-linux" + "aarch64-darwin" + "x86_64-darwin" + ]; + # This is a function that generates an attribute by calling a function you + # pass to it, with each system as an argument + forAllSystems = nixpkgs.lib.genAttrs systems; + in { + # Your custom packages + # Accessible through 'nix build', 'nix shell', etc + packages = forAllSystems (system: import ./pkgs nixpkgs.legacyPackages.${system}); + # Formatter for your nix files, available through 'nix fmt' + # Other options beside 'alejandra' include 'nixpkgs-fmt' + formatter = forAllSystems (system: nixpkgs.legacyPackages.${system}.alejandra); + + # Your custom packages and modifications, exported as overlays + overlays = import ./overlays {inherit inputs;}; + + nixosModules = builtins.listToAttrs ( + (map (x: { + name = x; + value = import (./modules + "/${x}"); + }) (builtins.attrNames (builtins.readDir ./modules))) + ++ [ + { + name = "agenix"; + value = agenix.nixosModules.default; + } + ] + ); + + homeManagerModules = + builtins.listToAttrs + ( + map + (name: { + inherit name; + value = import (./home-manager/modules + "/${name}"); + }) + (builtins.attrNames (builtins.readDir ./home-manager/modules)) + ) + // { + nix = {pkgs, ...}: { + imports = [ + inputs.nixvim.homeManagerModules.nixvim + # inputs.plasma-manager.homeManagerModules.plasma-manager + # inputs.wall-utils.homeManagerModules.wall-utils + ]; }; }; - homeConfigurations = { - luxzi = home-manager.lib.homeManagerConfiguration { - inherit pkgs; - modules = [ ./home-manager/home.nix catppuccin.homeManagerModules.catppuccin ]; - }; + # NixOS configuration entrypoint + # Available through 'nixos-rebuild --flake .#your-hostname' + # GreenMachine = nixpkgs.lib.nixosSystem { + # specialArgs = {inherit inputs outputs;}; + # modules = [ + # # > Our main nixos configuration file < + # ./nixos/GreenMachine/configuration.nix + # agenix.nixosModules.default + # ]; + # }; + # }; + nixosConfigurations = + builtins.listToAttrs + ( + map + (x: { + name = x; + value = nixpkgs.lib.nixosSystem { + specialArgs = { + inherit inputs; + flake-self = self; + }; + modules = + builtins.attrValues self.nixosModules + ++ [ + inputs.home-manager.nixosModules.home-manager + inputs.nix-gaming.nixosModules.platformOptimizations + inputs.nixvim.nixosModules.nixvim + (import "${./.}/machines/${x}/configuration.nix" {inherit self;}) + ]; + }; + }) + (builtins.attrNames (builtins.readDir ./machines)) + ); + homeConfigurations = { + lily = {...}: { + imports = + [ + ./home-manager/profiles/desktop.nix + ] + ++ builtins.attrValues self.homeManagerModules; }; }; + }; } diff --git a/home-manager/home.nix b/home-manager/home.nix deleted file mode 100644 index 1499e1c..0000000 --- a/home-manager/home.nix +++ /dev/null @@ -1,14 +0,0 @@ -{ config, pkgs, ... }: - -{ - imports = - [ - ./packages/packages.nix - ]; - - programs.home-manager.enable = true; - - home.username = "luxzi"; - home.homeDirectory = "/home/luxzi"; - home.stateVersion = "24.05"; -} diff --git a/home-manager/modules/chromium/default.nix b/home-manager/modules/chromium/default.nix new file mode 100644 index 0000000..4bc2a70 --- /dev/null +++ b/home-manager/modules/chromium/default.nix @@ -0,0 +1,27 @@ +{ + config, + lib, + ... +}: let + cfg = config.lily.chromium; +in { + options.lily.chromium = { + enable = lib.mkEnableOption "activate chromium"; + }; + config = lib.mkIf cfg.enable { + programs.chromium = { + enable = true; + extensions = [ + {id = "cjpalhdlnbpafiamejdnhcphjbkeiagm";} # ublock origin + {id = "pkehgijcmpdhfbdbbnkijodmdjhbjlgp";} # privacy badger + {id = "ldpochfccmkkmhdbclfhpagapcfdljkj";} # decentraleyes + {id = "mnjggcdmjocbbbhaepdhchncahnbgone";} # sponsor block + {id = "gebbhagfogifgggkldgodflihgfeippi";} # return youtube dislike (just cuz) + ]; + commandLineArgs = [ + "--enable-features=UseOzonePlatform" + "--ozone-platform=wayland" + ]; + }; + }; +} diff --git a/home-manager/modules/ghostty/default.nix b/home-manager/modules/ghostty/default.nix new file mode 100644 index 0000000..5226865 --- /dev/null +++ b/home-manager/modules/ghostty/default.nix @@ -0,0 +1,37 @@ +{ + config, + lib, + ... +}: let + cfg = config.lily.ghostty; +in { + options.lily.ghostty = { + enable = lib.mkEnableOption "activate ghostty"; + }; + + config = lib.mkIf cfg.enable { + home.file.".config/ghostty/shaders" = { + source = ./shaders; + recursive = true; + }; + programs.ghostty = { + enable = true; + + settings = { + background-blur-radius = 0; + #theme = "dark:catppuccin-mocha,light:catppuccin-latte"; + window-theme = "dark"; + background-opacity = 0.75; + minimum-contrast = 1.1; + window-padding-x = 5; + window-padding-y = 5; + gtk-adwaita = false; + gtk-titlebar = false; + # custom-shader = "shaders/crt.glsl"; + # custom-shader = "shaders/glow.glsl"; + confirm-close-surface = false; + custom-shader-animation = true; + }; + }; + }; +} diff --git a/home-manager/modules/ghostty/shaders/crt.glsl b/home-manager/modules/ghostty/shaders/crt.glsl new file mode 100644 index 0000000..ecce90d --- /dev/null +++ b/home-manager/modules/ghostty/shaders/crt.glsl @@ -0,0 +1,153 @@ +// First it does a "chromatic aberration" by splitting the rgb signals by a product of sin functions +// over time, then it does a glow effect in a perceptual color space +// Based on kalgynirae's Ghostty passable glow shader and NickWest's Chromatic Aberration shader demo +// Passable glow: https://github.com/kalgynirae/dotfiles/blob/main/ghostty/glow.glsl +// "Chromatic Aberration": https://www.shadertoy.com/view/Mds3zn + +// sRGB linear -> nonlinear transform from https://bottosson.github.io/posts/colorwrong/ +float f(float x) { + if (x >= 0.0031308) { + return 1.055 * pow(x, 1.0 / 2.4) - 0.055; + } else { + return 12.92 * x; + } +} + +float f_inv(float x) { + if (x >= 0.04045) { + return pow((x + 0.055) / 1.055, 2.4); + } else { + return x / 12.92; + } +} + +// Oklab <-> linear sRGB conversions from https://bottosson.github.io/posts/oklab/ +vec4 toOklab(vec4 rgb) { + vec3 c = vec3(f_inv(rgb.r), f_inv(rgb.g), f_inv(rgb.b)); + float l = 0.4122214708 * c.r + 0.5363325363 * c.g + 0.0514459929 * c.b; + float m = 0.2119034982 * c.r + 0.6806995451 * c.g + 0.1073969566 * c.b; + float s = 0.0883024619 * c.r + 0.2817188376 * c.g + 0.6299787005 * c.b; + float l_ = pow(l, 1.0 / 3.0); + float m_ = pow(m, 1.0 / 3.0); + float s_ = pow(s, 1.0 / 3.0); + return vec4( + 0.2104542553 * l_ + 0.7936177850 * m_ - 0.0040720468 * s_, + 1.9779984951 * l_ - 2.4285922050 * m_ + 0.4505937099 * s_, + 0.0259040371 * l_ + 0.7827717662 * m_ - 0.8086757660 * s_, + rgb.a + ); +} + +vec4 toRgb(vec4 oklab) { + vec3 c = oklab.rgb; + float l_ = c.r + 0.3963377774 * c.g + 0.2158037573 * c.b; + float m_ = c.r - 0.1055613458 * c.g - 0.0638541728 * c.b; + float s_ = c.r - 0.0894841775 * c.g - 1.2914855480 * c.b; + float l = l_ * l_ * l_; + float m = m_ * m_ * m_; + float s = s_ * s_ * s_; + vec3 linear_srgb = vec3( + 4.0767416621 * l - 3.3077115913 * m + 0.2309699292 * s, + -1.2684380046 * l + 2.6097574011 * m - 0.3413193965 * s, + -0.0041960863 * l - 0.7034186147 * m + 1.7076147010 * s + ); + return vec4( + clamp(f(linear_srgb.r), 0.0, 1.0), + clamp(f(linear_srgb.g), 0.0, 1.0), + clamp(f(linear_srgb.b), 0.0, 1.0), + oklab.a + ); +} + +// Bloom samples from https://gist.github.com/qwerasd205/c3da6c610c8ffe17d6d2d3cc7068f17f +const vec3[24] samples = { + vec3(0.1693761725038636, 0.9855514761735895, 1), + vec3(-1.333070830962943, 0.4721463328627773, 0.7071067811865475), + vec3(-0.8464394909806497, -1.51113870578065, 0.5773502691896258), + vec3(1.554155680728463, -1.2588090085709776, 0.5), + vec3(1.681364377589461, 1.4741145918052656, 0.4472135954999579), + vec3(-1.2795157692199817, 2.088741103228784, 0.4082482904638631), + vec3(-2.4575847530631187, -0.9799373355024756, 0.3779644730092272), + vec3(0.5874641440200847, -2.7667464429345077, 0.35355339059327373), + vec3(2.997715703369726, 0.11704939884745152, 0.3333333333333333), + vec3(0.41360842451688395, 3.1351121305574803, 0.31622776601683794), + vec3(-3.167149933769243, 0.9844599011770256, 0.30151134457776363), + vec3(-1.5736713846521535, -3.0860263079123245, 0.2886751345948129), + vec3(2.888202648340422, -2.1583061557896213, 0.2773500981126146), + vec3(2.7150778983300325, 2.5745586041105715, 0.2672612419124244), + vec3(-2.1504069972377464, 3.2211410627650165, 0.2581988897471611), + vec3(-3.6548858794907493, -1.6253643308191343, 0.25), + vec3(1.0130775986052671, -3.9967078676335834, 0.24253562503633297), + vec3(4.229723673607257, 0.33081361055181563, 0.23570226039551587), + vec3(0.40107790291173834, 4.340407413572593, 0.22941573387056174), + vec3(-4.319124570236028, 1.159811599693438, 0.22360679774997896), + vec3(-1.9209044802827355, -4.160543952132907, 0.2182178902359924), + vec3(3.8639122286635708, -2.6589814382925123, 0.21320071635561041), + vec3(3.3486228404946234, 3.4331800232609, 0.20851441405707477), + vec3(-2.8769733643574344, 3.9652268864187157, 0.20412414523193154) +}; + +float offsetFunction(float iTime) { + float amount = 1.0; + const float periods[4] = {6.0, 16.0, 19.0, 27.0}; + for (int i = 0; i < 4; i++) { + amount *= 1.0 + 0.5 * sin(iTime*periods[i]); + } + //return amount; + return amount * periods[3]; +} + +const float DIM_CUTOFF = 0.35; +const float BRIGHT_CUTOFF = 0.65; +const float ABBERATION_FACTOR = 0.05; + +void mainImage(out vec4 fragColor, in vec2 fragCoord) { + vec2 uv = fragCoord.xy / iResolution.xy; + + // Sample the original color + vec4 originalColor = texture(iChannel0, uv); + + // Check if the pixel is part of the text (assuming alpha > 0.0) + if (originalColor.a > 0.0) { + float amount = offsetFunction(iTime); + + vec3 col; + col.r = texture( iChannel0, vec2(uv.x-ABBERATION_FACTOR*amount / iResolution.x, uv.y) ).r; + col.g = texture( iChannel0, uv ).g; + col.b = texture( iChannel0, vec2(uv.x+ABBERATION_FACTOR*amount / iResolution.x, uv.y) ).b; + + vec4 splittedColor = vec4(col, originalColor.a); // Keep the original alpha + vec4 source = toOklab(splittedColor); + vec4 dest = source; + + if (source.x > DIM_CUTOFF) { + dest.x *= 1.2; + // dest.x = 1.2; + } else { + vec2 step = vec2(1.414) / iResolution.xy; + vec3 glow = vec3(0.0); + for (int i = 0; i < 24; i++) { + vec3 s = samples[i]; + float weight = s.z; + vec4 c = toOklab(texture(iChannel0, uv + s.xy * step)); + if (c.x > DIM_CUTOFF) { + glow.yz += c.yz * weight * 0.3; + if (c.x <= BRIGHT_CUTOFF) { + glow.x += c.x * weight * 0.05; + } else { + glow.x += c.x * weight * 0.10; + } + } + } + // float lightness_diff = clamp(glow.x - dest.x, 0.0, 1.0); + // dest.x = lightness_diff; + // dest.yz = dest.yz * (1.0 - lightness_diff) + glow.yz * lightness_diff; + dest.xyz += glow.xyz; + } + + fragColor = toRgb(dest); + } else { + // If the pixel is background, set alpha to 0.0 for transparency + fragColor = vec4(originalColor.rgb, 0.0); + } +} diff --git a/home-manager/modules/ghostty/shaders/glow.glsl b/home-manager/modules/ghostty/shaders/glow.glsl new file mode 100644 index 0000000..83bef9c --- /dev/null +++ b/home-manager/modules/ghostty/shaders/glow.glsl @@ -0,0 +1,145 @@ +// First it does a "chromatic aberration" by splitting the rgb signals by a product of sin functions +// over time, then it does a glow effect in a perceptual color space +// Based on kalgynirae's Ghostty passable glow shader and NickWest's Chromatic Aberration shader demo +// Passable glow: https://github.com/kalgynirae/dotfiles/blob/main/ghostty/glow.glsl +// "Chromatic Aberration": https://www.shadertoy.com/view/Mds3zn + +// sRGB linear -> nonlinear transform from https://bottosson.github.io/posts/colorwrong/ +float f(float x) { + if (x >= 0.0031308) { + return 1.055 * pow(x, 1.0 / 2.4) - 0.055; + } else { + return 12.92 * x; + } +} + +float f_inv(float x) { + if (x >= 0.04045) { + return pow((x + 0.055) / 1.055, 2.4); + } else { + return x / 12.92; + } +} + +// Oklab <-> linear sRGB conversions from https://bottosson.github.io/posts/oklab/ +vec4 toOklab(vec4 rgb) { + vec3 c = vec3(f_inv(rgb.r), f_inv(rgb.g), f_inv(rgb.b)); + float l = 0.4122214708 * c.r + 0.5363325363 * c.g + 0.0514459929 * c.b; + float m = 0.2119034982 * c.r + 0.6806995451 * c.g + 0.1073969566 * c.b; + float s = 0.0883024619 * c.r + 0.2817188376 * c.g + 0.6299787005 * c.b; + float l_ = pow(l, 1.0 / 3.0); + float m_ = pow(m, 1.0 / 3.0); + float s_ = pow(s, 1.0 / 3.0); + return vec4( + 0.2104542553 * l_ + 0.7936177850 * m_ - 0.0040720468 * s_, + 1.9779984951 * l_ - 2.4285922050 * m_ + 0.4505937099 * s_, + 0.0259040371 * l_ + 0.7827717662 * m_ - 0.8086757660 * s_, + rgb.a + ); +} + +vec4 toRgb(vec4 oklab) { + vec3 c = oklab.rgb; + float l_ = c.r + 0.3963377774 * c.g + 0.2158037573 * c.b; + float m_ = c.r - 0.1055613458 * c.g - 0.0638541728 * c.b; + float s_ = c.r - 0.0894841775 * c.g - 1.2914855480 * c.b; + float l = l_ * l_ * l_; + float m = m_ * m_ * m_; + float s = s_ * s_ * s_; + vec3 linear_srgb = vec3( + 4.0767416621 * l - 3.3077115913 * m + 0.2309699292 * s, + -1.2684380046 * l + 2.6097574011 * m - 0.3413193965 * s, + -0.0041960863 * l - 0.7034186147 * m + 1.7076147010 * s + ); + return vec4( + clamp(f(linear_srgb.r), 0.0, 1.0), + clamp(f(linear_srgb.g), 0.0, 1.0), + clamp(f(linear_srgb.b), 0.0, 1.0), + oklab.a + ); +} + +// Bloom samples from https://gist.github.com/qwerasd205/c3da6c610c8ffe17d6d2d3cc7068f17f +const vec3[24] samples = { + vec3(0.1693761725038636, 0.9855514761735895, 1), + vec3(-1.333070830962943, 0.4721463328627773, 0.7071067811865475), + vec3(-0.8464394909806497, -1.51113870578065, 0.5773502691896258), + vec3(1.554155680728463, -1.2588090085709776, 0.5), + vec3(1.681364377589461, 1.4741145918052656, 0.4472135954999579), + vec3(-1.2795157692199817, 2.088741103228784, 0.4082482904638631), + vec3(-2.4575847530631187, -0.9799373355024756, 0.3779644730092272), + vec3(0.5874641440200847, -2.7667464429345077, 0.35355339059327373), + vec3(2.997715703369726, 0.11704939884745152, 0.3333333333333333), + vec3(0.41360842451688395, 3.1351121305574803, 0.31622776601683794), + vec3(-3.167149933769243, 0.9844599011770256, 0.30151134457776363), + vec3(-1.5736713846521535, -3.0860263079123245, 0.2886751345948129), + vec3(2.888202648340422, -2.1583061557896213, 0.2773500981126146), + vec3(2.7150778983300325, 2.5745586041105715, 0.2672612419124244), + vec3(-2.1504069972377464, 3.2211410627650165, 0.2581988897471611), + vec3(-3.6548858794907493, -1.6253643308191343, 0.25), + vec3(1.0130775986052671, -3.9967078676335834, 0.24253562503633297), + vec3(4.229723673607257, 0.33081361055181563, 0.23570226039551587), + vec3(0.40107790291173834, 4.340407413572593, 0.22941573387056174), + vec3(-4.319124570236028, 1.159811599693438, 0.22360679774997896), + vec3(-1.9209044802827355, -4.160543952132907, 0.2182178902359924), + vec3(3.8639122286635708, -2.6589814382925123, 0.21320071635561041), + vec3(3.3486228404946234, 3.4331800232609, 0.20851441405707477), + vec3(-2.8769733643574344, 3.9652268864187157, 0.20412414523193154) +}; + +float offsetFunction(float iTime) { + float amount = 1.0; + const float periods[4] = {6.0, 16.0, 19.0, 27.0}; + for (int i = 0; i < 4; i++) { + amount *= 1.0 + 0.5 * sin(iTime*periods[i]); + } + //return amount; + return amount * periods[3]; +} + +const float DIM_CUTOFF = 0.35; +const float BRIGHT_CUTOFF = 0.65; +const float ABBERATION_FACTOR = 0.05; + +void mainImage(out vec4 fragColor, in vec2 fragCoord) { + vec2 uv = fragCoord.xy / iResolution.xy; + + float amount = offsetFunction(iTime); + + vec3 col; + col.r = texture( iChannel0, vec2(uv.x-ABBERATION_FACTOR*amount / iResolution.x, uv.y) ).r; + col.g = texture( iChannel0, uv ).g; + col.b = texture( iChannel0, vec2(uv.x+ABBERATION_FACTOR*amount / iResolution.x, uv.y) ).b; + + vec4 splittedColor = vec4(col, 1.0); + vec4 source = toOklab(splittedColor); + vec4 dest = source; + + if (source.x > DIM_CUTOFF) { + dest.x *= 1.2; + // dest.x = 1.2; + } else { + vec2 step = vec2(1.414) / iResolution.xy; + vec3 glow = vec3(0.0); + for (int i = 0; i < 24; i++) { + vec3 s = samples[i]; + float weight = s.z; + vec4 c = toOklab(texture(iChannel0, uv + s.xy * step)); + if (c.x > DIM_CUTOFF) { + glow.yz += c.yz * weight * 0.3; + if (c.x <= BRIGHT_CUTOFF) { + glow.x += c.x * weight * 0.05; + } else { + glow.x += c.x * weight * 0.10; + } + } + } + // float lightness_diff = clamp(glow.x - dest.x, 0.0, 1.0); + // dest.x = lightness_diff; + // dest.yz = dest.yz * (1.0 - lightness_diff) + glow.yz * lightness_diff; + dest.xyz += glow.xyz; + dest.a = 0.5; + } + + fragColor = toRgb(dest); +} diff --git a/home-manager/modules/git/default.nix b/home-manager/modules/git/default.nix new file mode 100644 index 0000000..9dd52b3 --- /dev/null +++ b/home-manager/modules/git/default.nix @@ -0,0 +1,33 @@ +{ + config, + lib, + ... +}: let + cfg = config.lily.git; +in { + options.lily.git = { + enable = lib.mkEnableOption "activate git"; + }; + + config = lib.mkIf cfg.enable { + programs.git = { + enable = true; + lfs.enable = true; + extraConfig = { + user = { + name = "Lily"; + email = "Caznix01@gmail.com"; + signingKey = "Caznix"; + }; + commit.gpgsign = true; + init.defaultBranch = "main"; + merge = { + ff = "no"; + no-commit = "yes"; + }; + pull.ff = "only"; + push = {autoSetupRemote = true;}; + }; + }; + }; +} diff --git a/home-manager/modules/hyprland/default.nix b/home-manager/modules/hyprland/default.nix new file mode 100644 index 0000000..1651a5c --- /dev/null +++ b/home-manager/modules/hyprland/default.nix @@ -0,0 +1,116 @@ +{ + config, + lib, + pkgs, + ... +}: let + cfg = config.lily.hyprland; +in { + options.lily.hyprland = { + enable = lib.mkEnableOption "activate hyprland"; + }; + + config = lib.mkIf cfg.enable { + home.packages = with pkgs; [ + wl-clipboard + ]; + programs.kitty.enable = true; # required for the default Hyprland config + wayland.windowManager.hyprland = { + enable = true; + settings = { + decoration = { + rounding = 10; + # rounding_power = 2; + blur = { + enabled = true; + size = 10; + passes = 3; + popups = true; + + xray = true; + }; + }; + blurls = "waybar"; + dwindle = { + pseudotile = true; # Master switch for pseudotiling. Enabling is bound to mainMod + P in the keybinds section below + preserve_split = true; # You probably want this + }; + general = { + resize_on_border = true; # Enables resizing by dragging window borders + extend_border_grab_area = 15; # Extends the clickable area around the border for resizing + hover_icon_on_border = true; # Shows a cursor icon when + layout = "dwindle"; + "col.active_border" = "rgba(C55900ee) rgba(FFAA63ee) 45deg"; + "col.inactive_border" = "rgba(595959aa)"; + border_size = 2; + gaps_out = 10; + }; + exec-once = [ + "${pkgs.kdePackages.kwallet-pam}/libexec/pam_kwallet_init" + "${pkgs.networkmanagerapplet}/bin/nm-applet" + "${pkgs.blueman}/bin/blueman-applet" + ]; + "$super" = "SUPER"; + "$alt_super" = "CTRL"; + + bind = [ + "$super, Q, killactive" + "$alt_super $super,Q,exit" + # Screenshot region + "$super SHIFT,S, exec, GRIM_DEFAULT_DIR=${config.home.homeDirectory}/Pictures/Screenshots/ ${pkgs.grim}/bin/grim -g \"$(${pkgs.slurp}/bin/slurp)\" - | wl-copy " + "$super,T, exec, ghostty" + "$super, L,exec, hyprlock --immediate" + "$super, B,exec, chromium" + "$super,F,fullscreen" + "$super SHIFT,F,togglefloating" + "$super,E,exec,kate" + + "ALT,SPACE,exec, rofi -show drun" + "$super, P, pseudo," + + "$super, 1, workspace, 1" + "$super, 2, workspace, 2" + "$super, 3, workspace, 3" + "$super, 4, workspace, 4" + "$super, 5, workspace, 5" + "$super, 6, workspace, 6" + "$super, 7, workspace, 7" + "$super, 8, workspace, 8" + "$super, 9, workspace, 9" + "$super, 0, workspace, 10" + + # Move active window to a workspace iwth mainMod + SHIFT + j + "$super SHIFT, 1, movetoworkspace, 1" + "$super SHIFT, 2, movetoworkspace, 2" + "$super SHIFT, 3, movetoworkspace, 3" + "$super SHIFT, 4, movetoworkspace, 4" + "$super SHIFT, 5, movetoworkspace, 5" + "$super SHIFT, 6, movetoworkspace, 6" + "$super SHIFT, 7, movetoworkspace, 7" + "$super SHIFT, 8, movetoworkspace, 8" + "$super SHIFT, 9, movetoworkspace, 9" + "$super SHIFT, 0, movetoworkspace, 10" + + "$super, J, togglesplit" + + "$super, left, movefocus, l" + "$super, right, movefocus, r" + "$super, up, movefocus, u" + "$super, down, movefocus, d" + ]; + bindm = [ + "$super, mouse:272, movewindow" + "$super, mouse:273, resizewindow" + ]; + bindel = [ + ",XF86AudioRaiseVolume, exec, wpctl set-volume -l 1 @DEFAULT_AUDIO_SINK@ 5%+" + ",XF86AudioLowerVolume, exec, wpctl set-volume @DEFAULT_AUDIO_SINK@ 5%-" + ",XF86AudioMute, exec, wpctl set-mute @DEFAULT_AUDIO_SINK@ toggle" + ",XF86AudioMicMute, exec, wpctl set-mute @DEFAULT_AUDIO_SOURCE@ toggle" + ",XF86MonBrightnessUp, exec, ${pkgs.brightnessctl}/bin/brightnessctl s 10%+" + ",XF86MonBrightnessDown, exec, ${pkgs.brightnessctl}/bin/brightnessctl s 10%-" + ]; + }; + }; + }; +} diff --git a/home-manager/modules/neovim/colorscheme.nix b/home-manager/modules/neovim/colorscheme.nix new file mode 100644 index 0000000..20d2df5 --- /dev/null +++ b/home-manager/modules/neovim/colorscheme.nix @@ -0,0 +1,42 @@ +{...}: { + programs.nixvim = { + colorschemes.catppuccin = { + enable = true; + settings = { + flavour = "mocha"; + background = { + light = "latte"; + dark = "mocha"; + }; + transparent_background = true; + show_end_of_buffer = false; + term_colors = false; + dim_inactive.enabled = false; + no_italic = false; + no_bold = false; + styles = { + comments = ["italic"]; + conditionals = ["italic"]; + loops = null; + functions = null; + keywords = null; + strings = null; + variables = null; + numbers = null; + booleans = null; + properties = null; + types = null; + operators = null; + }; + integrations = { + cmp = true; + gitsigns = true; + nvimtree = true; + telescope = true; + notify = false; + mini = false; + }; + }; + }; + }; +} diff --git a/home-manager/modules/neovim/default.nix b/home-manager/modules/neovim/default.nix new file mode 100644 index 0000000..0876035 --- /dev/null +++ b/home-manager/modules/neovim/default.nix @@ -0,0 +1,32 @@ +{ + pkgs, + nixvim, + config, + lib, + ... +}: let + cfg = config.lily.neovim; +in { + imports = [ + # ./colorscheme.nix + ./plugins + ./keybinds.nix + ]; + options.lily.neovim = { + enable = lib.mkEnableOption "activate neovim"; + }; + config = lib.mkIf cfg.enable { + programs.nixvim = { + enable = true; + defaultEditor = true; + viAlias = true; + vimAlias = true; + vimdiffAlias = true; + + performance = { + byteCompileLua.enable = true; + combinePlugins = {}; + }; + }; + }; +} diff --git a/home-manager/modules/neovim/keybinds.nix b/home-manager/modules/neovim/keybinds.nix new file mode 100644 index 0000000..1ebf6ab --- /dev/null +++ b/home-manager/modules/neovim/keybinds.nix @@ -0,0 +1,32 @@ +{...}: { + programs.nixvim = { + globals = { + mapleader = " "; + maplocalleader = " "; + }; + keymaps = [ + { + mode = ["n" "v"]; + key = ""; + action = ""; + options.silent = true; + } + + { + mode = "n"; + key = ","; + action = "A,"; + options.silent = true; + } + { + mode = "n"; + key = "sf"; + action.__raw = "require('telescope.builtin').find_files"; + options = { + silent = true; + desc = "[S]earch [F]iles"; + }; + } + ]; + }; +} diff --git a/home-manager/modules/neovim/plugins/default.nix b/home-manager/modules/neovim/plugins/default.nix new file mode 100644 index 0000000..8031650 --- /dev/null +++ b/home-manager/modules/neovim/plugins/default.nix @@ -0,0 +1,24 @@ +{...}: { + imports = [ + ./telescope.nix + ./lualine.nix + ./treesitter.nix + ./gitsigns.nix + ./tree.nix + ./lsp + # ./dap.nix + ]; + programs.nixvim.plugins = { + sleuth.enable = true; + comment.enable = true; + indent-blankline.enable = true; + web-devicons.enable = true; + fugitive.enable = true; + markdown-preview.enable = true; + + git-worktree = { + enable = true; + enableTelescope = true; + }; + }; +} diff --git a/home-manager/modules/neovim/plugins/gitsigns.nix b/home-manager/modules/neovim/plugins/gitsigns.nix new file mode 100644 index 0000000..ac877f5 --- /dev/null +++ b/home-manager/modules/neovim/plugins/gitsigns.nix @@ -0,0 +1,45 @@ +{...}: { + programs.nixvim.plugins.gitsigns = { + enable = true; + settings = { + signs = { + add.text = "▎"; + change.text = "▎"; + delete.text = ""; + topdelete.text = ""; + changedelete.text = "▎"; + }; + + signs_staged_enable = true; + signcolumn = true; + numhl = false; + linehl = false; + word_diff = false; + watch_gitdir = { + interval = 1000; + follow_files = true; + }; + attach_to_untracked = true; + current_line_blame = false; + current_line_blame_opts = { + virt_text = true; + virt_text_pos = "eol"; + delay = 100; + ignore_whitespace = true; + }; + + current_line_blame_formatter = ", — "; + sign_priority = 6; + status_formatter = null; + update_debounce = 200; + max_file_length = 40000; + preview_config = { + border = "rounded"; + style = "minimal"; + relative = "cursor"; + row = 0; + col = 1; + }; + }; + }; +} diff --git a/home-manager/modules/neovim/plugins/lsp/cmp.nix b/home-manager/modules/neovim/plugins/lsp/cmp.nix new file mode 100644 index 0000000..cb9fa0f --- /dev/null +++ b/home-manager/modules/neovim/plugins/lsp/cmp.nix @@ -0,0 +1,85 @@ +{...}: { + programs.nixvim.plugins = { + cmp = { + autoEnableSources = false; + enable = true; + settings = { + snippet.expand = "function(args) require('luasnip').lsp_expand(args.body) end"; + formatting = { + fields = ["kind" "abbr" "menu"]; + format = '' + function(entry, vim_item) + local kind_icons = { + Text = "󰉿", + Method = "󰆧", + Function = "󰊕", + Constructor = "", + Field = " ", + Variable = "󰀫", + Class = "󰠱", + Interface = "", + Module = "", + Property = "󰜢", + Unit = "󰑭", + Value = "󰎠", + Enum = "", + Keyword = "󰌋", + Snippet = "", + Color = "󰏘", + File = "󰈙", + Reference = "", + Folder = "󰉋", + EnumMember = "", + Constant = "󰏿", + Struct = "", + Event = "", + Operator = "󰆕", + TypeParameter = " ", + Misc = " ", + } + vim_item.kind = string.format("%s", kind_icons[vim_item.kind]) + vim_item.abbr = vim_item.abbr .. " " .. (vim_item.menu and vim_item.menu or "") + if vim.fn.strchars(vim_item.abbr) > 50 then + vim_item.abbr = vim.fn.strcharpart(vim_item.abbr, 0, 50) .. "..." + end + vim_item.menu = ({ + nvim_lsp = "[LSP]", + luasnip = "[Snippet]", + buffer = "[Buffer]", + path = "[Path]" + })[entry.source.name] + return vim_item + end + ''; + }; + mapping.__raw = '' cmp.mapping.preset.insert({ + [""] = cmp.mapping.scroll_docs(-4), + [""] = cmp.mapping.scroll_docs(4), + [""] = cmp.mapping.complete(), + [""] = cmp.mapping.confirm({ + behavior = cmp.ConfirmBehavior.Replace, + select = true, + }), + [""] = cmp.mapping.select_prev_item(), + [""] = cmp.mapping.select_next_item(), + })''; + window = { + completion.__raw = "cmp.config.window.bordered()"; + documentation.__raw = "cmp.config.window.bordered()"; + }; + sources = [ + {name = "nvim_lsp";} + {name = "luasnip";} + {name = "path";} + {name = "buffer";} + {name = "crates";} + ]; + }; + }; + cmp_luasnip.enable = true; + cmp-buffer.enable = true; + cmp-path.enable = true; + cmp-nvim-lsp.enable = true; + luasnip.enable = true; + }; +} diff --git a/home-manager/modules/neovim/plugins/lsp/default.nix b/home-manager/modules/neovim/plugins/lsp/default.nix new file mode 100644 index 0000000..1b5ce1e --- /dev/null +++ b/home-manager/modules/neovim/plugins/lsp/default.nix @@ -0,0 +1,192 @@ +{pkgs, ...}: { + imports = [ + ./cmp.nix + ]; + programs.nixvim.plugins = { + crates.enable = true; # Does not work + dressing.enable = true; + }; + programs.nixvim.extraConfigVim = '' + augroup unrecognized_filetypes + autocmd! + autocmd BufRead,BufNewFile *.vert set filetype=glsl + autocmd BufRead,BufNewFile *.tesc set filetype=glsl + autocmd BufRead,BufNewFile *.tese set filetype=glsl + autocmd BufRead,BufNewFile *.frag set filetype=glsl + autocmd BufRead,BufNewFile *.geom set filetype=glsl + autocmd BufRead,BufNewFile *.comp set filetype=glsl + autocmd BufRead,BufNewFile *.qml set filetype=qml + autocmd BufRead,BufNewFile *.slint set filetype=slint + autocmd BufRead,BufNewFile *.typ set filetype=typst + augroup END + ''; + programs.nixvim.plugins.lsp = { + enable = true; + + capabilities = '' + capabilities = require('cmp_nvim_lsp').default_capabilities(capabilities) + capabilities.textDocument.completion.completionItem.snippetSupport = true''; + preConfig = '' + local border = { + { "╭", "FloatBorder" }, + { "─", "FloatBorder" }, + { "╮", "FloatBorder" }, + { "│", "FloatBorder" }, + { "╯", "FloatBorder" }, + { "─", "FloatBorder" }, + { "╰", "FloatBorder" }, + { "│", "FloatBorder" } + } + vim.lsp.handlers["textDocument/hover"] = vim.lsp.with(vim.lsp.handlers.hover, { border = border }) + vim.lsp.handlers["textDocument/signatureHelp"] = vim.lsp.with(vim.lsp.handlers.signature_help, { border = border }) + ''; + + inlayHints = true; + servers = { + clangd = { + enable = true; + settings.arguments = [ + "--clang-tidy" + "--background-index" + "--completion-style=detailed" + "--cross-file-rename" + "--header-insertion=iwyu" + "--all-scopes-completion" + ]; + }; + # jdtls.enable = true; + emmet_ls.enable = true; + ts_ls.enable = true; + cssls.enable = true; + # glsl_analyzer.enable = true; + glslls.enable = true; + pyright.enable = true; + nixd.enable = true; + lua_ls = { + enable = true; + settings = { + telemetry.enable = false; + workspace.checkThirdParty = false; + }; + }; + svelte = { + enable = true; + settings.enable_ts_plugin = true; + }; + slint_lsp.enable = true; + zls.enable = true; + rust_analyzer = { + enable = true; + installRustc = false; + installCargo = false; + settings = { + imports = { + granularity.group = "crate"; + prefix = "self"; + preferNoStd = true; + }; + check = { + command = "clippy"; + allTargets = true; + }; + completion = { + fullFunctionSignatures.enable = false; + autoimport.enable = true; + }; + cargo = { + allTargets = true; + features = "all"; + }; + procMacro.enable = true; + }; + }; + }; + keymaps = { + silent = true; + extra = [ + { + mode = "n"; + key = "rn"; + action.__raw = "vim.lsp.buf.rename"; + } + { + mode = "n"; + key = "ca"; + action.__raw = "vim.lsp.buf.code_action"; + } + { + mode = "n"; + key = "di"; + action.__raw = "vim.diagnostic.open_float"; + } + { + mode = "n"; + key = "dv"; + action.__raw = "require('telescope.builtin').diagnostics"; + } + + { + mode = "n"; + key = "gd"; + action.__raw = "vim.lsp.buf.definition"; + } + { + mode = "n"; + key = "gr"; + action.__raw = "require('telescope.builtin').lsp_references"; + } + { + mode = "n"; + key = "gI"; + action.__raw = "vim.lsp.buf.implementation"; + } + { + mode = "n"; + key = "D"; + action.__raw = "vim.lsp.buf.type_definition"; + } + { + mode = "n"; + key = "ds"; + action.__raw = "require('telescope.builtin').lsp_document_symbols"; + } + { + mode = "n"; + key = "ws"; + action.__raw = "require('telescope.builtin').lsp_dynamic_workspace_symbols"; + } + { + mode = "n"; + key = "K"; + action.__raw = "vim.lsp.buf.hover"; + } + { + mode = "n"; + key = "k"; + action.__raw = "vim.lsp.buf.signature_help"; + } + + { + mode = "n"; + key = "gD"; + action.__raw = "vim.lsp.buf.declaration"; + } + { + mode = "n"; + key = "wa"; + action.__raw = "vim.lsp.buf.add_workspace_folder"; + } + { + mode = "n"; + key = "wr"; + action.__raw = "vim.lsp.buf.remove_workspace_folder"; + } + { + mode = "n"; + key = "wl"; + action.__raw = "function() print(vim.inspect(vim.lsp.buf.list_workspace_folders())) end"; + } + ]; + }; + }; +} diff --git a/home-manager/modules/neovim/plugins/lualine.nix b/home-manager/modules/neovim/plugins/lualine.nix new file mode 100644 index 0000000..a56b133 --- /dev/null +++ b/home-manager/modules/neovim/plugins/lualine.nix @@ -0,0 +1,21 @@ +{...}: { + programs.nixvim.plugins.lualine = { + enable = true; + settings = { + options = { + icons_enabled = true; + component_seperators = { + left = "|"; + right = "|"; + }; + section_seperators = { + left = ""; + right = ""; + }; + disabled_filetypes.statusline = ["NvimTree" "alpha"]; + disabled_filetypes.winbar = ["NvimTree" "alpha"]; + theme = null; + }; + }; + }; +} diff --git a/home-manager/modules/neovim/plugins/telescope.nix b/home-manager/modules/neovim/plugins/telescope.nix new file mode 100644 index 0000000..1a3c2de --- /dev/null +++ b/home-manager/modules/neovim/plugins/telescope.nix @@ -0,0 +1,47 @@ +{...}: { + programs.nixvim.plugins.telescope = { + enable = true; + extensions = { + fzf-native.enable = true; + file-browser.enable = true; + }; + settings = { + theme = "dropdown"; + defaults = { + prompt_prefix = " "; + selection_caret = " "; + entry_prefix = " "; + initial_mode = "insert"; + selection_strategy = "reset"; + layout_config = {}; + mappings.i = { + "" = false; + "" = false; + }; + file_ignore_patters = {}; + path_display = "smart"; + winblend = 0; + border = {}; + borderchars = null; + color_devicons = true; + set_env = {COLORTERM = "truecolor";}; + }; + pickers = { + planets = { + show_pluto = true; + show_moon = true; + }; + git_files = { + hidden = true; + show_untracked = true; + }; + colorscheme = { + enable_preview = true; + }; + find_files = { + hidden = true; + }; + }; + }; + }; +} diff --git a/home-manager/modules/neovim/plugins/tree.nix b/home-manager/modules/neovim/plugins/tree.nix new file mode 100644 index 0000000..98c3779 --- /dev/null +++ b/home-manager/modules/neovim/plugins/tree.nix @@ -0,0 +1,17 @@ +{ + programs.nixvim.plugins.nvim-tree = { + enable = true; + disableNetrw = true; + hijackNetrw = true; + diagnostics.enable = true; + preferStartupRoot = false; + syncRootWithCwd = true; + view = { + side = "left"; + width = 30; + }; + renderer.groupEmpty = true; + actions.openFile.resizeWindow = true; + git.ignore = false; + }; +} diff --git a/home-manager/modules/neovim/plugins/treesitter.nix b/home-manager/modules/neovim/plugins/treesitter.nix new file mode 100644 index 0000000..96f94ab --- /dev/null +++ b/home-manager/modules/neovim/plugins/treesitter.nix @@ -0,0 +1,19 @@ +{config, ...}: { + programs.nixvim.plugins.treesitter = { + enable = true; + nixvimInjections = true; + settings = { + indent.enable = true; + incremental_selection = { + enable = true; + # keymaps = { + # init_selection = ""; + # node_incremental = ""; + # scope_incremental = " C++ == 1 - ;;clojure ; java with a lisp - ;;common-lisp ; if you've seen one lisp, you've seen them all - ;;coq ; proofs-as-programs - ;;crystal ; ruby at the speed of c - ;;csharp ; unity, .NET, and mono shenanigans - ;;data ; config/data formats - ;;(dart +flutter) ; paint ui and not much else - ;;dhall - ;;elixir ; erlang done right - ;;elm ; care for a cup of TEA? - emacs-lisp ; drown in parentheses - ;;erlang ; an elegant language for a more civilized age - ;;ess ; emacs speaks statistics - ;;factor - ;;faust ; dsp, but you get to keep your soul - ;;fortran ; in FORTRAN, GOD is REAL (unless declared INTEGER) - ;;fsharp ; ML stands for Microsoft's Language - ;;fstar ; (dependent) types and (monadic) effects and Z3 - ;;gdscript ; the language you waited for - ;;(go +lsp) ; the hipster dialect - ;;(graphql +lsp) ; Give queries a REST - (haskell +lsp) ; a language that's lazier than I am - ;;hy ; readability of scheme w/ speed of python - ;;idris ; a language you can depend on - ;;json ; At least it ain't XML - ;;(java +lsp) ; the poster child for carpal tunnel syndrome - ;;javascript ; all(hope(abandon(ye(who(enter(here)))))) - ;;julia ; a better, faster MATLAB - ;;kotlin ; a better, slicker Java(Script) - latex ; writing papers in Emacs has never been so fun - ;;lean ; for folks with too much to prove - ;;ledger ; be audit you can be - ;;lua ; one-based indices? one-based indices - markdown ; writing docs for people to ignore - ;;nim ; python + lisp at the speed of c - nix ; I hereby declare "nix geht mehr!" - ;;ocaml ; an objective camel - org ; organize your plain life in plain text - ;;php ; perl's insecure younger brother - ;;plantuml ; diagrams for confusing people more - ;;purescript ; javascript, but functional - python ; beautiful is better than ugly - ;;qt ; the 'cutest' gui framework ever - ;;racket ; a DSL for DSLs - ;;raku ; the artist formerly known as perl6 - ;;rest ; Emacs as a REST client - ;;rst ; ReST in peace - ;;(ruby +rails) ; 1.step {|i| p "Ruby is #{i.even? ? 'love' : 'life'}"} - (rust +lsp) ; Fe2O3.unwrap().unwrap().unwrap().unwrap() - ;;scala ; java, but good - ;;(scheme +guile) ; a fully conniving family of lisps - sh ; she sells {ba,z,fi}sh shells on the C xor - ;;sml - ;;solidity ; do you need a blockchain? No. - ;;swift ; who asked for emoji variables? - ;;terra ; Earth and Moon in alignment for performance. - ;;web ; the tubes - ;;yaml ; JSON, but readable - ;;zig ; C, but simpler - - :email - ;;(mu4e +org +gmail) - ;;notmuch - ;;(wanderlust +gmail) - - :app - ;;calendar - ;;emms - ;;everywhere ; *leave* Emacs!? You must be joking - ;;irc ; how neckbeards socialize - ;;(rss +org) ; emacs as an RSS reader - - :config - ;;literate - (default +bindings +smartparens)) diff --git a/home-manager/packages/doom-emacs/.doom.d/packages.el b/home-manager/packages/doom-emacs/.doom.d/packages.el deleted file mode 100644 index 4047ab8..0000000 --- a/home-manager/packages/doom-emacs/.doom.d/packages.el +++ /dev/null @@ -1,63 +0,0 @@ -;; -*- no-byte-compile: t; -*- -;;; $DOOMDIR/packages.el - -;; To install a package with Doom you must declare them here and run 'doom sync' -;; on the command line, then restart Emacs for the changes to take effect -- or -;; use 'M-x doom/reload'. - - -;; To install SOME-PACKAGE from MELPA, ELPA or emacsmirror: -;; (package! some-package) - -;; To install a package directly from a remote git repo, you must specify a -;; `:recipe'. You'll find documentation on what `:recipe' accepts here: -;; https://github.com/radian-software/straight.el#the-recipe-format -;; (package! another-package -;; :recipe (:host github :repo "username/repo")) - -;; If the package you are trying to install does not contain a PACKAGENAME.el -;; file, or is located in a subdirectory of the repo, you'll need to specify -;; `:files' in the `:recipe': -;; (package! this-package -;; :recipe (:host github :repo "username/repo" -;; :files ("some-file.el" "src/lisp/*.el"))) - -;; If you'd like to disable a package included with Doom, you can do so here -;; with the `:disable' property: -;; (package! builtin-package :disable t) - -;; You can override the recipe of a built in package without having to specify -;; all the properties for `:recipe'. These will inherit the rest of its recipe -;; from Doom or MELPA/ELPA/Emacsmirror: -;; (package! builtin-package :recipe (:nonrecursive t)) -;; (package! builtin-package-2 :recipe (:repo "myfork/package")) - -;; Specify a `:branch' to install a package from a particular branch or tag. -;; This is required for some packages whose default branch isn't 'master' (which -;; our package manager can't deal with; see radian-software/straight.el#279) -;; (package! builtin-package :recipe (:branch "develop")) - -;; Use `:pin' to specify a particular commit to install. -;; (package! builtin-package :pin "1a2b3c4d5e") - - -;; Doom's packages are pinned to a specific commit and updated from release to -;; release. The `unpin!' macro allows you to unpin single packages... -;; (unpin! pinned-package) -;; ...or multiple packages -;; (unpin! pinned-package another-pinned-package) -;; ...Or *all* packages (NOT RECOMMENDED; will likely break things) -;; (unpin! t) - -(package! elcord) -(package! catppuccin-theme) -(package! org-view-mode) -(package! org-superstar) -(package! lsp-ui) -(package! svelte-mode) -(package! typescript-mode) - -(setq lsp-log-io t) -(add-hook 'org-mode-hook - (lambda () - (org-superstar-mode 1))) diff --git a/home-manager/packages/doom-emacs/.gitignore b/home-manager/packages/doom-emacs/.gitignore deleted file mode 100644 index 6daab5a..0000000 --- a/home-manager/packages/doom-emacs/.gitignore +++ /dev/null @@ -1 +0,0 @@ -!.doom.d/ diff --git a/home-manager/packages/emacs.nix b/home-manager/packages/emacs.nix deleted file mode 100644 index 6d1e57d..0000000 --- a/home-manager/packages/emacs.nix +++ /dev/null @@ -1,23 +0,0 @@ -{ pkgs, config, lib, ... }: - -{ - programs.emacs = { - enable = true; - package = pkgs.emacs; - }; - - home.activation = { - cloneDoomEmacs = '' - if [ ! -d "$HOME/.emacs.d" ]; then - ${pkgs.git}/bin/git clone https://github.com/doomemacs/doomemacs $HOME/.emacs.d - fi - ''; - }; - - home.file.".doom.d" = { - source = ./doom-emacs/.doom.d; - recursive = true; - onChange = "${config.home.homeDirectory}/.emacs.d/bin/doom sync"; - force = true; - }; -} diff --git a/home-manager/packages/git.nix b/home-manager/packages/git.nix deleted file mode 100644 index 707417f..0000000 --- a/home-manager/packages/git.nix +++ /dev/null @@ -1,22 +0,0 @@ -{ ... }: - -{ - programs.git = { - enable = true; - userName = "luxzi"; - userEmail = "lesson085@gmail.com"; - aliases = { - pf = "push --force"; - kl = "log --show-signature"; - }; - signing = { - key = "C90237A70F2FDD53"; - signByDefault = true; - }; - extraConfig = { - init.defaultBranch = "main"; - core.symlinks = true; - commit.gpgsign = true; - }; - }; -} diff --git a/home-manager/packages/kitty.nix b/home-manager/packages/kitty.nix deleted file mode 100644 index b071f86..0000000 --- a/home-manager/packages/kitty.nix +++ /dev/null @@ -1,17 +0,0 @@ -{ pkgs, ... }: - -{ - programs.kitty = { - enable = true; - font = { - name = "FiraCode Nerd Font"; - package = pkgs.nerd-fonts.fira-code; - size = 14; - }; - settings = { - window_padding_width = 4; - background_opacity = "0.65"; - background_blur = 1; - }; - }; -} diff --git a/home-manager/packages/packages.nix b/home-manager/packages/packages.nix deleted file mode 100644 index eefd3b9..0000000 --- a/home-manager/packages/packages.nix +++ /dev/null @@ -1,30 +0,0 @@ -{ pkgs, ... }: - -{ - imports = - [ - ./zsh.nix - ./git.nix - ./emacs.nix - ./kitty.nix - ]; - - home.packages = with pkgs; [ - hyfetch - nix-output-monitor - firefox - tree - vesktop - fzf - tor-browser - nix-search-cli - mpv - element-desktop - mission-center - nvtop - alacritty - nerd-fonts.fira-code - ]; - - nixpkgs.config.allowUnfree = true; -} diff --git a/home-manager/packages/zsh.nix b/home-manager/packages/zsh.nix deleted file mode 100644 index 956dd25..0000000 --- a/home-manager/packages/zsh.nix +++ /dev/null @@ -1,99 +0,0 @@ -{ ... }: - -{ - programs.zsh = { - enable = true; - enableCompletion = true; - autosuggestion.enable = true; - syntaxHighlighting.enable = true; - autocd = true; - shellAliases = { - hm-switch = "home-manager switch --flake $HOME/.dotfiles"; - nx-switch = "sudo nixos-rebuild switch --flake $HOME/.dotfiles"; - nx-boot = "sudo nixos-rebuild boot --flake $HOME/.dotfiles"; - nx-clean = "sudo nix-collect-garbage --delete-old && nix-collect-garbage --delete-old"; - hm-clean = "home-manager remove-generations"; - gl-switch = "sudo nixos-rebuild switch --flake $HOME/.dotfiles && home-manager switch --flake $HOME/.dotfiles"; - gl-clean = "sudo nix-collect-garbage --delete-old && nix-collect-garbage --delete-old && home-manager remove-generations"; - snv = "sudo -E nvim"; - sen = "sudo -E"; - emacs-config = "emacs --chdir $HOME/.dotfiles/home-manager/packages/doom-emacs/.doom.d &"; - }; - - zplug = { - enable = true; - plugins = [ - { name = "Aloxaf/fzf-tab"; } - ]; - }; - - history = { - size = 5000; - save = 5000; - ignoreAllDups = true; - ignoreDups = true; - ignoreSpace = true; - share = true; - }; - - initExtra = '' - bindkey -v - bindkey '^k' history-search-backward - bindkey '^j' history-search-forward - setopt appendHistory - zstyle ':completion:*' matcher-list 'm:{a-z}={A-Za-z}' - zstyle ':completion:*' menu no - zstyle ':fzf-tab:complete:cd:*' fzf-preview 'ls --color $realpath' - eval "$(fzf --zsh)" - ''; - }; - - programs.starship = { - enable = true; - settings = { - format = "$username$hostname$directory$git_branch$git_state$git_status$nix_shell$cmd_duration$line_break$python$character"; - - directory = { - style = "blue"; - }; - - character = { - success_symbol = "[❯](white)"; - error_symbol = "[❯](red)"; - vimcmd_symbol = "[❮](green)"; - }; - - git_branch = { - format = "[$branch]($style)"; - style = "green"; - }; - - git_status = { - format = "[[($conflicted$untracked$modified$staged$renamed$deleted)](218) ($ahead_behind$stashed)]($style)"; - style = "cyan"; - conflicted = "!"; - untracked = "​u"; - modified = "​*"; - staged = "​+"; - renamed = "r"; - deleted = "d"; - stashed = "≡"; - }; - - git_state = { - format = "\([$state( $progress_current/$progress_total)]($style)\) "; - style = "bright-black"; - }; - - cmd_duration = { - format = "[$duration]($style) "; - style = "yellow"; - }; - - python = { - format = "[$virtualenv]($style) "; - style = "bright-black"; - }; - }; - }; -} diff --git a/home-manager/profiles/desktop.nix b/home-manager/profiles/desktop.nix new file mode 100644 index 0000000..00cfd63 --- /dev/null +++ b/home-manager/profiles/desktop.nix @@ -0,0 +1,22 @@ +{pkgs, ...}: { + imports = [ + ./main.nix + ]; + programs.direnv = { + enable = true; + nix-direnv.enable = true; + }; + lily = { + hyprland.enable = true; + ghostty.enable = true; + neovim.enable = true; + rofi.enable = true; + vscode.enable = true; + zed.enable = true; + waybar.enable = true; + chromium.enable = true; + }; + home.packages = with pkgs; [ + vesktop + ]; +} diff --git a/home-manager/profiles/main.nix b/home-manager/profiles/main.nix new file mode 100644 index 0000000..b252192 --- /dev/null +++ b/home-manager/profiles/main.nix @@ -0,0 +1,10 @@ +{pkgs, ...}: { + home.stateVersion = "24.11"; + programs.home-manager.enable = true; + nixpkgs.config.allowUnfree = true; + + lily = { + zsh.enable = true; + git.enable = true; + }; +} diff --git a/machines/nix/configuration.nix b/machines/nix/configuration.nix new file mode 100644 index 0000000..05600e5 --- /dev/null +++ b/machines/nix/configuration.nix @@ -0,0 +1,79 @@ +# This is your system's configuration file. +# Use this to configure your system environment (it replaces /etc/nixos/configuration.nix) +{...}: { + inputs, + outputs, + lib, + config, + pkgs, + flake-self, + ... +}: { + # You can import other NixOS modules here + imports = [ + # Or modules from other flakes (such as nixos-hardware): + # inputs.hardware.nixosModules.common-cpu-amd + # inputs.hardware.nixosModules.common-ssd + + # inputs.home-manager.nixosModules.home-manager + # inputs.nix-gaming.nixosModules.platformOptimizations + + # Import your generated (nixos-generate-config) hardware configuration + ./hardware-configuration.nix + # ../common.nix + # ./plymouth.nix + ]; + lily = { + users.lily.enable = true; + laptop.enable = true; + common.enable = true; + containers = { + enable = true; + podman = true; + # docker = false; + }; + nvidia.enable = true; + desktop = { + enable = true; + hyprland.enable = true; + plasma.enable = true; + }; + }; + networking.hostName = "nix"; + + boot = { + loader = { + systemd-boot.enable = true; + efi.canTouchEfiVariables = true; + timeout = 0; + }; + consoleLogLevel = 0; + initrd.verbose = false; + kernelPackages = pkgs.linuxPackages_lqx; + kernelParams = [ + "quiet" + "splash" + ]; + }; + + programs = { + steam = { + enable = true; + remotePlay.openFirewall = true; + dedicatedServer.openFirewall = true; + platformOptimizations.enable = true; + localNetworkGameTransfers.openFirewall = true; + gamescopeSession.enable = true; + extraCompatPackages = let gamePkgs = inputs.nix-gaming.packages.${pkgs.hostPlatform.system}; in [pkgs.proton-ge-bin gamePkgs.northstar-proton]; + }; + }; + + home-manager = { + users = { + lily = flake-self.homeConfigurations.lily; + }; + }; + + # https://nixos.wiki/wiki/FAQ/When_do_I_update_stateVersion + # system.stateVersion = "24.11"; +} diff --git a/machines/nix/hardware-configuration.nix b/machines/nix/hardware-configuration.nix new file mode 100644 index 0000000..6be9341 --- /dev/null +++ b/machines/nix/hardware-configuration.nix @@ -0,0 +1,45 @@ +# 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" "thunderbolt" "nvme" "usb_storage" "usbhid" "sd_mod" "rtsx_pci_sdmmc"]; + boot.initrd.kernelModules = []; + boot.kernelModules = ["kvm-intel"]; + boot.extraModulePackages = []; + + fileSystems."/" = { + device = "/dev/disk/by-uuid/95c3ec11-8329-4b54-a690-97c31250a110"; + fsType = "btrfs"; + options = ["subvol=@"]; + }; + + fileSystems."/boot" = { + device = "/dev/disk/by-uuid/9666-823F"; + fsType = "vfat"; + options = ["fmask=0077" "dmask=0077"]; + }; + + swapDevices = [ + {device = "/dev/disk/by-uuid/5fd02c5b-4ce0-46be-8771-9c1b0d280d8d";} + ]; + + # 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.wlp92s0.useDHCP = lib.mkDefault true; + + nixpkgs.hostPlatform = lib.mkDefault "x86_64-linux"; + hardware.cpu.intel.updateMicrocode = lib.mkDefault config.hardware.enableRedistributableFirmware; +} diff --git a/machines/nix/plymouth.nix b/machines/nix/plymouth.nix new file mode 100644 index 0000000..3dd9c93 --- /dev/null +++ b/machines/nix/plymouth.nix @@ -0,0 +1,31 @@ +{pkgs, ...}: { + boot = { + plymouth = { + enable = true; + theme = "bgrt"; + #themePackages = with pkgs; [ + # By default we would install all themes + #(adi1090x-plymouth-themes.override { + # selected_themes = [ "bgrt" ]; + #}) + #]; + }; + + # Enable "Silent Boot" + consoleLogLevel = 0; + initrd.verbose = false; + kernelParams = [ + "quiet" + "splash" + "boot.shell_on_fail" + "loglevel=3" + "rd.systemd.show_status=false" + "rd.udev.log_level=3" + "udev.log_priority=3" + ]; + # Hide the OS choice for bootloaders. + # It's still possible to open the bootloader list by pressing any key + # It will just not appear on screen unless a key is pressed + loader.timeout = 0; + }; +} diff --git a/modules/common/common.nix b/modules/common/common.nix new file mode 100644 index 0000000..f8dd76f --- /dev/null +++ b/modules/common/common.nix @@ -0,0 +1,47 @@ +{ + config, + lib, + pkgs, + ... +}: let + cfg = config.lily.common; +in { + options.lily.common.enable = lib.mkEnableOption "activate common"; + config = lib.mkIf cfg.enable { + programs.gnupg.agent = { + enable = true; + enableSSHSupport = true; + }; + services.openssh.enable = true; + programs.zsh.enable = true; + environment.systemPackages = with pkgs; [ + git + neovim + toybox + util-linux + tmux + ghostty + + # encryption and filesystem + cryptsetup + age + + # network tools + wget + curl + # FS-tools + unzip + gnutar + xz + bzip2 + p7zip + + netcat-gnu + dnsutils + fd + file + tree + ]; + environment.shells = with pkgs; [zsh]; + }; +} diff --git a/modules/common/default.nix b/modules/common/default.nix new file mode 100644 index 0000000..4181c63 --- /dev/null +++ b/modules/common/default.nix @@ -0,0 +1,17 @@ +{lib, ...}: let + # recursively construct attr-set of a directory + getDir = dir: + lib.mapAttrs (file: type: + if type == "directory" + then getDir "${dir}/${file}" + else type) ( + builtins.readDir dir + ); + files = dir: lib.collect lib.isString (lib.mapAttrsRecursive (path: type: lib.concatStringsSep "/" path) (getDir dir)); + validFiles = dir: + map (file: ./. + "/${file}") ( + lib.filter (file: lib.hasSuffix ".nix" file && file != "default.nix") (files dir) + ); +in { + imports = validFiles ./.; +} diff --git a/modules/common/desktop.nix b/modules/common/desktop.nix new file mode 100644 index 0000000..8d83f6d --- /dev/null +++ b/modules/common/desktop.nix @@ -0,0 +1,82 @@ +{ + pkgs, + lib, + config, + flake-self, + ... +}: let + cfg = config.lily.desktop; +in { + options.lily.desktop = { + enable = lib.mkEnableOption "activate desktop"; + plasma.enable = lib.mkEnableOption "activate plasma desktop environment"; + hyprland.enable = lib.mkEnableOption "activate hyprland desktop"; + }; + + config = lib.mkIf cfg.enable { + lily = { + plasma.enable = cfg.plasma.enable; + hyprland.enable = cfg.hyprland.enable; + }; + programs = { + dconf.enable = true; + kdeconnect.enable = true; + }; + environment.systemPackages = with pkgs; [ + vulkan-tools + jq + libqalculate + envsubst + glib + headsetcontrol + ]; + networking = { + networkmanager.enable = true; + }; + + fonts = { + enableDefaultPackages = true; + packages = with pkgs; [ + jetbrains-mono + noto-fonts-color-emoji + garamond-libre + helvetica-neue-lt-std + # nerd-fonts.jetbrains-mono + ]; + fontDir.enable = true; + fontconfig = { + defaultFonts = { + monospace = ["JetBrainsMono Bold"]; + serif = ["Garamond Libre"]; + sansSerif = ["Helvetica Neue LT Std"]; + emoji = ["Noto Color Emoji"]; + }; + }; + }; + + security.rtkit.enable = true; + services.pipewire = { + enable = true; + alsa = { + enable = true; + support32Bit = true; + }; + audio.enable = true; + wireplumber.enable = true; + pulse.enable = true; + jack.enable = true; + }; + + # services.printing.enable = true; + # services.flatpak.enable = true; + services.avahi = { + enable = true; + nssmdns4 = true; + openFirewall = true; + }; + services.udev.packages = [pkgs.headsetcontrol]; + # environment.sessionVariables = { + # MOZ_DISABLE_RDD_SANDBOX = "1"; + # }; + }; +} diff --git a/modules/common/locale.nix b/modules/common/locale.nix new file mode 100644 index 0000000..fbe8f00 --- /dev/null +++ b/modules/common/locale.nix @@ -0,0 +1,18 @@ +{...}: { + # Select internationalisation properties. + i18n = { + defaultLocale = "en_US.UTF-8"; + extraLocaleSettings = { + LC_ADDRESS = "en_US.UTF-8"; + LC_IDENTIFICATION = "en_US.UTF-8"; + LC_MEASUREMENT = "en_US.UTF-8"; + LC_MONETARY = "en_US.UTF-8"; + LC_NAME = "en_US.UTF-8"; + LC_NUMERIC = "en_US.UTF-8"; + LC_PAPER = "en_US.UTF-8"; + LC_TELEPHONE = "en_US.UTF-8"; + LC_TIME = "en_US.UTF-8"; + }; + }; + time.timeZone = "America/Detroit"; +} diff --git a/modules/common/nixcommon.nix b/modules/common/nixcommon.nix new file mode 100644 index 0000000..9156239 --- /dev/null +++ b/modules/common/nixcommon.nix @@ -0,0 +1,49 @@ +{ + inputs, + outputs, + config, + pkgs, + ... +}: { + nixpkgs.config.allowUnfree = true; + + home-manager = { + extraSpecialArgs = {inherit inputs outputs;}; + useGlobalPkgs = true; + useUserPackages = true; + }; + + nix = { + nixPath = ["nixpkgs=${inputs.nixpkgs}"]; + package = pkgs.nixVersions.stable; + optimise.automatic = true; + gc = { + persistent = true; + automatic = true; + }; + extraOptions = '' + # If set to true, Nix will fall back to building from source if a binary substitute fails. + fallback = true + # the timeout (in seconds) for establishing connections in the binary cache substituter. + connect-timeout = 10 + # these log lines are only shown on a failed build + log-lines = 25 + ''; + settings = { + auto-optimise-store = true; + + trusted-users = ["root" "@wheel"]; + experimental-features = [ + "nix-command" + "flakes" + ]; + }; + }; + # 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 + # this value at the release version of the first install of this system. + # Before changing this value read the documentation for this option + # (e.g. man configuration.nix or on https://nixos.org/nixos/options.html). + system.stateVersion = "24.11"; +} diff --git a/modules/containers/default.nix b/modules/containers/default.nix new file mode 100644 index 0000000..5786d90 --- /dev/null +++ b/modules/containers/default.nix @@ -0,0 +1,48 @@ +{ + pkgs, + lib, + config, + ... +}: let + cfg = config.lily.containers; +in { + options.lily.containers = { + enable = lib.mkEnableOption "activate containers"; + docker = lib.mkEnableOption "activate docker"; + podman = lib.mkEnableOption "activate podman"; + }; + + config = lib.mkMerge [ + # (lib.mkIf (cfg.enable && cfg.docker && cfg.podman) + # (builtins.throw "You can't enable both docker and podman at the same time")) + { + assertions = [ + { + assertion = !(cfg.docker && cfg.podman); + message = "You cannot enable docker and podman at the same time"; + } + ]; + } + (lib.mkIf (cfg.enable && cfg.docker) { + # Enable docker support: + virtualisation.containers.enable = true; + virtualisation.docker.enable = true; + }) + (lib.mkIf (cfg.enable && cfg.podman) { + # Enable podman support: + virtualisation.containers.enable = true; + virtualisation.podman = { + enable = true; + dockerCompat = true; + dockerSocket.enable = true; + defaultNetwork.settings = { + dns_enabled = true; + }; + }; + environment.systemPackages = with pkgs; [ + podman + podman-compose + ]; + }) + ]; +} diff --git a/modules/fileshare/default.nix b/modules/fileshare/default.nix new file mode 100644 index 0000000..4181c63 --- /dev/null +++ b/modules/fileshare/default.nix @@ -0,0 +1,17 @@ +{lib, ...}: let + # recursively construct attr-set of a directory + getDir = dir: + lib.mapAttrs (file: type: + if type == "directory" + then getDir "${dir}/${file}" + else type) ( + builtins.readDir dir + ); + files = dir: lib.collect lib.isString (lib.mapAttrsRecursive (path: type: lib.concatStringsSep "/" path) (getDir dir)); + validFiles = dir: + map (file: ./. + "/${file}") ( + lib.filter (file: lib.hasSuffix ".nix" file && file != "default.nix") (files dir) + ); +in { + imports = validFiles ./.; +} diff --git a/modules/fileshare/samba.nix b/modules/fileshare/samba.nix new file mode 100644 index 0000000..6e21f88 --- /dev/null +++ b/modules/fileshare/samba.nix @@ -0,0 +1,55 @@ +{ + config, + lib, + ... +}: let + cfg = config.lily.fileshare; +in { + options.lily.fileshare.enable = lib.mkEnableOption "activate local filesharing"; + + config = lib.mkIf cfg.enable { + services.samba = { + enable = true; + securityType = "user"; #Keep user, but use guest account. + openFirewall = true; + settings = { + global = { + workgroup = "WORKGROUP"; #Ensure this matches your network's workgroup. + "server string" = "smbnix"; + "netbios name" = "smbnix"; + "security" = "user"; #Keep this as user, but guest will be used for access. + "hosts allow" = "192.168.1. 127.0.0.1 localhost"; #Adjust to your LAN. + "hosts deny" = "0.0.0.0/0"; + "guest account" = "nobody"; #Important for guest access. + "map to guest" = "bad user"; #Maps unknown users to guest. + }; + "public" = { + "path" = "/ext/share"; + "browseable" = "yes"; + "read only" = "no"; + "guest ok" = "yes"; #Allows guest access. + "create mask" = "0644"; + "directory mask" = "0755"; + }; + }; + }; + + services.samba-wsdd = { + enable = true; + openFirewall = true; + }; + services.avahi = { + enable = true; + nssmdns = true; + nssmdns4 = true; + openFirewall = true; + reflector = true; + publish = { + domain = true; + enable = true; + userServices = true; + addresses = true; + }; + }; + }; +} diff --git a/modules/hardware/default.nix b/modules/hardware/default.nix new file mode 100644 index 0000000..4181c63 --- /dev/null +++ b/modules/hardware/default.nix @@ -0,0 +1,17 @@ +{lib, ...}: let + # recursively construct attr-set of a directory + getDir = dir: + lib.mapAttrs (file: type: + if type == "directory" + then getDir "${dir}/${file}" + else type) ( + builtins.readDir dir + ); + files = dir: lib.collect lib.isString (lib.mapAttrsRecursive (path: type: lib.concatStringsSep "/" path) (getDir dir)); + validFiles = dir: + map (file: ./. + "/${file}") ( + lib.filter (file: lib.hasSuffix ".nix" file && file != "default.nix") (files dir) + ); +in { + imports = validFiles ./.; +} diff --git a/modules/hardware/laptop.nix b/modules/hardware/laptop.nix new file mode 100644 index 0000000..e467522 --- /dev/null +++ b/modules/hardware/laptop.nix @@ -0,0 +1,33 @@ +{ + config, + lib, + ... +}: let + cfg = config.lily.laptop; +in { + options.lily.laptop.enable = lib.mkEnableOption "activate laptop hardware"; + + config = lib.mkIf cfg.enable { + hardware.bluetooth = { + enable = true; + powerOnBoot = true; + settings = { + General = { + Experimental = true; + Enable = "Source,Sink,Media,Socket"; + }; + }; + }; + powerManagement.enable = true; + + services = { + libinput.enable = true; + }; + systemd.sleep.extraConfig = '' + AllowSuspend=yes + AllowHibernation=yes + AllowHybridSleep=yes + AllowSuspendThenHibernate=yes + ''; + }; +} diff --git a/modules/hardware/nvidia.nix b/modules/hardware/nvidia.nix new file mode 100644 index 0000000..c57a737 --- /dev/null +++ b/modules/hardware/nvidia.nix @@ -0,0 +1,67 @@ +{ + config, + lib, + pkgs, + ... +}: let + cfg = config.lily.nvidia; +in { + options.lily.nvidia.enable = lib.mkEnableOption "activate Nvidia GPU support"; + config = lib.mkIf cfg.enable { + services.xserver.videoDrivers = ["nvidia"]; + environment.systemPackages = with pkgs; [ + libva-utils + nvidia-vaapi-driver + nvtopPackages.nvidia + pciutils + vdpauinfo + cudaPackages.cudatoolkit + cudaPackages.cudnn + cudaPackages.cutensor + ]; + # environment.sessionVariables = lib.mkIf config.lily.wayland.enable { + # GBM_BACKEND = "nvidia-drm"; + # __GLX_VENDOR_LIBRARY_NAME = "nvidia"; + # __GL_GSYNC_ALLOWED = "1"; + # }; + hardware = { + graphics = { + enable = true; + enable32Bit = true; + extraPackages = with pkgs; [ + vaapiVdpau + libvdpau-va-gl + nvidia-vaapi-driver + ocl-icd + ]; + extraPackages32 = with pkgs; [vaapiVdpau]; + }; + nvidia = { + # Modesetting is required. + modesetting.enable = true; + + # Nvidia power management. Experimental, and can cause sleep/suspend to fail. + # Enable this if you have graphical corruption issues or application crashes after waking + # up from sleep. This fixes it by saving the entire VRAM memory to /tmp/ instead + # of just the bare essentials. + powerManagement.enable = true; + + # Fine-grained power management. Turns off GPU when not in use. + # Experimental and only works on modern Nvidia GPUs (Turing or newer). + powerManagement.finegrained = false; + + # Use the NVidia open source kernel module (not to be confused with the + # independent third-party "nouveau" open source driver). + # Support is limited to the Turing and later architectures. Full list of + # supported GPUs is at: + # https://github.com/NVIDIA/open-gpu-kernel-modules#compatible-gpus + # Only available from driver 515.43.04+ + # Currently alpha-quality/buggy, so false is currently the recommended setting. + open = true; + + # Optionally, you may need to select the appropriate driver version for your specific GPU. + package = config.boot.kernelPackages.nvidiaPackages.stable; + }; + }; + }; +} diff --git a/modules/hyprland/default.nix b/modules/hyprland/default.nix new file mode 100644 index 0000000..7538b6b --- /dev/null +++ b/modules/hyprland/default.nix @@ -0,0 +1,141 @@ +{ + config, + lib, + pkgs, + inputs, + ... +}: let + cfg = config.lily.hyprland; +in { + options.lily.hyprland = { + enable = lib.mkEnableOption "activate hyprland"; + }; + config = lib.mkIf cfg.enable { + lily = { + wayland.enable = true; + }; + + services.displayManager.sddm = lib.mkDefault { + enable = true; + wayland.enable = true; + package = pkgs.kdePackages.sddm; + theme = "breeze"; + wayland.compositor = "kwin"; + extraPackages = with pkgs.kdePackages; [ + breeze-icons + kirigami + libplasma + plasma5support + qtsvg + qtvirtualkeyboard + ]; + }; + + programs.hyprland = { + enable = true; + withUWSM = true; + systemd.setPath.enable = true; + }; + programs.waybar.enable = true; + services.blueman.enable = true; + + qt.enable = true; + qt.platformTheme = "kde"; + + environment.systemPackages = with pkgs; [ + # KDE APPLICATIONS + kdePackages.dolphin + kdePackages.systemsettings + + kdePackages.qtwayland + + kdePackages.kwallet # provides helper service + kdePackages.kwallet-pam # provides helper service + kdePackages.kwalletmanager # provides KCMs and stuff + + # FRAMEWORKS AND BASES + kdePackages.plasma-desktop + kdePackages.plasma-workspace + kdePackages.frameworkintegration # For qt plugins + kdePackages.plasma-integration # kde platform theme + kdePackages.sonnet + kdePackages.libplasma + kdePackages.qtsvg + kdePackages.ksvg + kdePackages.knewstuff + kdePackages.kdeplasma-addons + kdePackages.qtsvg + kdePackages.qtdeclarative + kdePackages.kcoreaddons + kdePackages.kguiaddons + kdePackages.kirigami-addons + kdePackages.plasma-integration.qt5 + kdePackages.qtlocation + + # artwork, makes appliations which require org.kde.destkop work + kdePackages.breeze + kdePackages.breeze-icons + kdePackages.breeze-gtk + kdePackages.ocean-sound-theme + kdePackages.plasma-workspace-wallpapers + hicolor-icon-theme # fallback icons + kdePackages.qqc2-breeze-style + kdePackages.qqc2-desktop-style + + kdePackages.breeze.qt5 + kdePackages.plasma-integration.qt5 + plasma5Packages.kwayland-integration + ]; + environment.sessionVariables = { + XDG_CURRENT_DESKTOP = "Hyprland"; + XDG_SESSION_DESKTOP = "Hyprland"; + KPACKAGE_DEP_RESOLVERS_PATH = "${pkgs.kdePackages.frameworkintegration.out}/libexec/kf6/kpackagehandlers"; + }; + services.udisks2.enable = true; + services.upower.enable = true; + services.power-profiles-daemon.enable = true; + # make open menu work + environment.etc."xdg/menus/applications.menu" = { + source = "${pkgs.kdePackages.plasma-workspace}/etc/xdg/menus/plasma-applications.menu"; + }; + # + + programs.ssh.askPassword = lib.mkDefault "${pkgs.kdePackages.ksshaskpass.out}/bin/ksshaskpass"; + programs.gnupg.agent.pinentryPackage = lib.mkForce pkgs.pinentry-qt; + security.pam.services = { + login.kwallet = { + enable = true; + package = lib.mkDefault pkgs.kdePackages.kwallet-pam; + }; + }; + + programs.dconf.enable = true; + + programs.kdeconnect.package = lib.mkForce pkgs.kdePackages.kdeconnect-kde; + systemd = { + user.services.polkit-gnome-authentication-agent-1 = { + description = "polkit-gnome-authentication-agent-1"; + wantedBy = ["graphical-session.target"]; + wants = ["graphical-session.target"]; + after = ["graphical-session.target"]; + serviceConfig = { + Type = "simple"; + ExecStart = "${pkgs.polkit_gnome}/libexec/polkit-gnome-authentication-agent-1"; + Restart = "on-failure"; + RestartSec = 1; + TimeoutStopSec = 10; + }; + }; + user.services.powerdevil = { + description = "powerdevil"; + wantedBy = ["graphical-session.target"]; + wants = ["graphical-session.target"]; + after = ["graphical-session.target"]; + serviceConfig = { + Type = "simple"; + ExecStart = "${pkgs.kdePackages.powerdevil}/libexec/org_kde_powerdevil"; + }; + }; + }; + }; +} diff --git a/modules/plasma/default.nix b/modules/plasma/default.nix new file mode 100644 index 0000000..463113f --- /dev/null +++ b/modules/plasma/default.nix @@ -0,0 +1,18 @@ +{ + lib, + config, + ... +}: let + cfg = config.lily.plasma; +in { + options.lily.plasma.enable = lib.mkEnableOption "activate plasma"; + config = lib.mkIf cfg.enable { + services = { + displayManager.sddm = { + enable = true; + wayland.enable = true; + }; + desktopManager.plasma6.enable = true; + }; + }; +} diff --git a/modules/runners/default.nix b/modules/runners/default.nix new file mode 100644 index 0000000..da876fe --- /dev/null +++ b/modules/runners/default.nix @@ -0,0 +1,32 @@ +{ + lib, + config, + pkgs, + ... +}: let + cfg = config.lily.runners; +in { + options.lily.runners.enable = lib.mkEnableOption "activate plasma"; + config = lib.mkIf cfg.enable { + # Example + # age.secrets.lily.file = ./secrets/lily.age; + # services.gitea-actions-runner = { + # package = pkgs.forgejo-runner; + # instances = { + # lilyvex = { + # enable = true; + # name = "caz-runner"; + # # token = runner-key; + # tokenFile = config.age.secrets.lily.path; + # url = "https://git.lilyvex.dev/"; + # labels = [ + # "node-22:docker://node:22-bookworm" + # "nixos-latest:docker://nixos/nix" + # "ubuntu-latest:docker://node:16-bullseye" + # ]; + # #settings = { ... }; + # }; + # }; + # }; + }; +} diff --git a/modules/runners/secrets/lily.age b/modules/runners/secrets/lily.age new file mode 100644 index 0000000..99a1a64 --- /dev/null +++ b/modules/runners/secrets/lily.age @@ -0,0 +1,7 @@ +age-encryption.org/v1 +-> ssh-ed25519 gwCq6Q YfhZEEqe8nFJInm13FuPk3lAS5MpTHeTbPYE2czQJmk +YApzb5JSzg+hGULtJGOzH04XWuzjTtf4jB9rPnweBzU +-> ssh-ed25519 TvHG8g o8lSKhyOUvW8lz303Z6b5/TasTiN4ENcS0Bg1ZAugFA +e5tvFv819718uInabUIRJYOC45f/MYQkI4jep+DA+6o +--- Hw3Q1yUIXUmajkeK0sBRjLQcR4GjFh97hTu9jTIopIM +.��-�ԓN1�3$�0�\ ��2�p���|/�y��7S�X5bLdI�t��������r �F�2`�X�s�����#� \ No newline at end of file diff --git a/modules/runners/secrets/potato.age b/modules/runners/secrets/potato.age new file mode 100644 index 0000000000000000000000000000000000000000..31c066ed90b632c9f963394ed00fdcc1bca5f78a GIT binary patch literal 369 zcmYdHPt{G$OD?J`D9Oyv)5|YP*Do{V(zR14F3!+RO))YxHMCSnFLy393si6}wFq*~ z%&*KT&ayCf^ht~`54VW$4l2?P2{tzl4v0!EFY+)C(+~2_v*4;KFp3N;&#EZP_i!&M z4-U=NH*+yWAi($k@O!%p|JP z(#ONeD=E!iJHREwC&a=f)hWWiz&Fv*IH$Zk+?6XkFEHCTztSMhz$+uypvXP7!XnHi z*wwKp%)B78AR;v}yRNVj04s>=MZK(1D^GSwsY@dpJMZg1(DyCbT9No3v?vF}rv>s@|5FrIp6 z_WbL23*%F^H1P;tDOtZ{ja8KH9476A*MDseZgfyj^>F{hZ&ott&P?xy=fBlfssR8@ C$b$g@ literal 0 HcmV?d00001 diff --git a/modules/runners/secrets/secrets.nix b/modules/runners/secrets/secrets.nix new file mode 100644 index 0000000..5bd7b7f --- /dev/null +++ b/modules/runners/secrets/secrets.nix @@ -0,0 +1,19 @@ +let + lily = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIHj4f4GlA+DP491i9ssmm+Ys/TLikz6ALk1kkglhcywY lily@GreenMachine"; + users = [lily]; + system = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAID/rgN3hR4K2Mu/Oy3tgaGfDfCss3CrNJn2jTTQJQKKn root@nixos"; + systems = [system]; +in { + # age.secrets.potato.file = ./potato.age; + # age.secrets.lily.file = ./lily.age; + "potato.age".publicKeys = [ + lily + + system + ]; + "lily.age".publicKeys = [ + lily + + system + ]; +} diff --git a/modules/users/default.nix b/modules/users/default.nix new file mode 100644 index 0000000..4181c63 --- /dev/null +++ b/modules/users/default.nix @@ -0,0 +1,17 @@ +{lib, ...}: let + # recursively construct attr-set of a directory + getDir = dir: + lib.mapAttrs (file: type: + if type == "directory" + then getDir "${dir}/${file}" + else type) ( + builtins.readDir dir + ); + files = dir: lib.collect lib.isString (lib.mapAttrsRecursive (path: type: lib.concatStringsSep "/" path) (getDir dir)); + validFiles = dir: + map (file: ./. + "/${file}") ( + lib.filter (file: lib.hasSuffix ".nix" file && file != "default.nix") (files dir) + ); +in { + imports = validFiles ./.; +} diff --git a/modules/users/lily.nix b/modules/users/lily.nix new file mode 100644 index 0000000..986e761 --- /dev/null +++ b/modules/users/lily.nix @@ -0,0 +1,21 @@ +{ + lib, + config, + pkgs, + ... +}: let + cfg = config.lily.users.lily; + # interpolated_secrets = import ../../secrets/interpolated_secrets.nix; +in { + options.lily.users.lily.enable = lib.mkEnableOption "activate user lily"; + config = lib.mkIf cfg.enable { + users.users.lily = { + home = "/home/lily"; + isNormalUser = true; + # hashedPasswordFile = lib.mkIf config.lily.sops config.sops.secrets."users/lily/hashedPassword".path; + extraGroups = ["wheel" "openrazer" "docker"] ++ lib.optionals config.networking.networkmanager.enable ["networkmanager"]; + shell = pkgs.zsh; + }; + # sops.secrets."users/lily/hashedPassword" = lib.mkIf config.lily.sops { neededForUsers = true; }; + }; +} diff --git a/modules/wayland/default.nix b/modules/wayland/default.nix new file mode 100644 index 0000000..c896cc9 --- /dev/null +++ b/modules/wayland/default.nix @@ -0,0 +1,37 @@ +{ + lib, + pkgs, + config, + ... +}: let + cfg = config.lily.wayland; +in { + options.lily.wayland.enable = lib.mkEnableOption "activate wayland"; + config = lib.mkIf cfg.enable { + programs.xwayland.enable = true; + environment.systemPackages = with pkgs; + [ + wl-clipboard + xwayland + xwaylandvideobridge + wayland-utils + wev + ] + ++ lib.optionals (config.lily.plasma.enable) [kdePackages.plasma-wayland-protocols]; + environment.sessionVariables = { + NIXOS_OZONE_WL = "1"; + MOZ_ENABLE_WAYLAND = "1"; + QT_QUICK_CONTROLS_STYLE = "org.kde.desktop"; + SDL_VIDEODRIVER = "wayland"; + CLUTTER_BACKEND = "wayland"; + QT_QPA_PLATFORM = "wayland;xcb"; + XDG_SESSION_TYPE = "wayland"; + GDK_BACKEND = "wayland,x11"; + }; + services.dbus.enable = true; + security = { + polkit.enable = true; + rtkit.enable = true; + }; + }; +} diff --git a/nixos/configuration.nix b/nixos/configuration.nix deleted file mode 100644 index 0984d3f..0000000 --- a/nixos/configuration.nix +++ /dev/null @@ -1,28 +0,0 @@ -{ config, lib, pkgs, self, ... }: - -{ - imports = - [ # Include the results of the hardware scan. - ./hardware/hardware.nix - ./environments/plasma-wayland.nix - # ./environments/gnome.nix - ./users/luxzi.nix - ./services/services.nix - ./programs/programs.nix - ./misc/misc.nix - ]; - - nixpkgs.config.allowUnfree = true; - - # Copy the NixOS configuration file and link it from the resulting system - # (/run/current-system/configuration.nix). This is useful in case you - # accidentally delete configuration.nix. - # system.copySystemConfiguration = true; - - # This value does NOT affect the Nixpkgs version your packages and OS are pulled from, - # so changing it will NOT upgrade your system - see https://nixos.org/manual/nixos/stable/#sec-upgrading for how - # to actually do that. - # For more information, see `man configuration.nix` or https://nixos.org/manual/nixos/stable/options#opt-system.stateVersion . - system.stateVersion = "24.05"; # Did you read the comment? -} - diff --git a/nixos/environments/gnome.nix b/nixos/environments/gnome.nix deleted file mode 100644 index ce7d35f..0000000 --- a/nixos/environments/gnome.nix +++ /dev/null @@ -1,9 +0,0 @@ -{ ... }: - -{ - services.xserver.enable = true; - services.xserver.videoDrivers = ["nvidia"]; - services.xserver.displayManager.gdm.enable = true; - services.xserver.displayManager.gdm.wayland = true; - services.xserver.desktopManager.gnome.enable = true; -} diff --git a/nixos/environments/plasma-wayland.nix b/nixos/environments/plasma-wayland.nix deleted file mode 100644 index fb77cf1..0000000 --- a/nixos/environments/plasma-wayland.nix +++ /dev/null @@ -1,14 +0,0 @@ -{ pkgs, ... }: - -{ - services.xserver.videoDrivers = ["nvidia"]; - - services.displayManager.sddm.enable = true; - services.displayManager.sddm.wayland.enable = true; - services.desktopManager.plasma6.enable = true; - - environment.plasma6.excludePackages = with pkgs; [ - plasma-browser-integration - konsole - ]; -} diff --git a/nixos/hardware/fstab.nix b/nixos/hardware/fstab.nix deleted file mode 100644 index b8cbc26..0000000 --- a/nixos/hardware/fstab.nix +++ /dev/null @@ -1,14 +0,0 @@ -{ ... }: - -{ - fileSystems."/" = - { device = "/dev/disk/by-uuid/afce32c1-67df-4324-aebb-a113b71317b9"; - fsType = "ext4"; - }; - - fileSystems."/boot" = - { device = "/dev/disk/by-uuid/12CE-A600"; - fsType = "vfat"; - options = [ "fmask=0022" "dmask=0022" ]; - }; -} diff --git a/nixos/hardware/hardware.nix b/nixos/hardware/hardware.nix deleted file mode 100644 index c7cd0a6..0000000 --- a/nixos/hardware/hardware.nix +++ /dev/null @@ -1,13 +0,0 @@ -{ ... }: - -{ - imports = - [ - ./modules.nix - ./fstab.nix - ./audio.nix - ./network.nix - ./intel.nix - ./nvidia.nix - ]; -} diff --git a/nixos/hardware/intel.nix b/nixos/hardware/intel.nix deleted file mode 100644 index 88bf59e..0000000 --- a/nixos/hardware/intel.nix +++ /dev/null @@ -1,6 +0,0 @@ -{ lib, config, ... }: - -{ - nixpkgs.hostPlatform = lib.mkDefault "x86_64-linux"; - hardware.cpu.intel.updateMicrocode = lib.mkDefault config.hardware.enableRedistributableFirmware; -} diff --git a/nixos/hardware/modules.nix b/nixos/hardware/modules.nix deleted file mode 100644 index 1593b53..0000000 --- a/nixos/hardware/modules.nix +++ /dev/null @@ -1,13 +0,0 @@ -{ modulesPath, ... }: - -{ - imports = - [ - (modulesPath + "/installer/scan/not-detected.nix") - ]; - - boot.initrd.availableKernelModules = [ "xhci_pci" "ahci" "nvme" "usbhid" "usb_storage" "sd_mod" ]; - boot.initrd.kernelModules = [ ]; - boot.kernelModules = [ "kvm-intel" ]; - boot.extraModulePackages = [ ]; -} diff --git a/nixos/hardware/network.nix b/nixos/hardware/network.nix deleted file mode 100644 index 45bc069..0000000 --- a/nixos/hardware/network.nix +++ /dev/null @@ -1,5 +0,0 @@ -{ lib, ... }: - -{ - networking.useDHCP = lib.mkDefault true; -} diff --git a/nixos/hardware/nvidia.nix b/nixos/hardware/nvidia.nix deleted file mode 100644 index eb1abd6..0000000 --- a/nixos/hardware/nvidia.nix +++ /dev/null @@ -1,13 +0,0 @@ -{ config, ... }: - -{ - hardware.graphics.enable = true; - hardware.nvidia = { - modesetting.enable = true; - powerManagement.enable = false; - powerManagement.finegrained = false; - open = false; - nvidiaSettings = false; - package = config.boot.kernelPackages.nvidiaPackages.stable; - }; -} diff --git a/nixos/misc/locale.nix b/nixos/misc/locale.nix deleted file mode 100644 index 01de88c..0000000 --- a/nixos/misc/locale.nix +++ /dev/null @@ -1,5 +0,0 @@ -{ ... }: - -{ - i18n.defaultLocale = "en_US.UTF-8"; -} diff --git a/nixos/misc/misc.nix b/nixos/misc/misc.nix deleted file mode 100644 index 0ff1eca..0000000 --- a/nixos/misc/misc.nix +++ /dev/null @@ -1,10 +0,0 @@ -{ ... }: - -{ - imports = - [ - ./time.nix - ./locale.nix - ./nixconfig.nix - ]; -} diff --git a/nixos/misc/nixconfig.nix b/nixos/misc/nixconfig.nix deleted file mode 100644 index 88d2b4a..0000000 --- a/nixos/misc/nixconfig.nix +++ /dev/null @@ -1,6 +0,0 @@ -{ ... }: - -{ - nix.settings.experimental-features = [ "nix-command" "flakes" ]; - nixpkgs.config.allowUnfree = true; -} diff --git a/nixos/misc/time.nix b/nixos/misc/time.nix deleted file mode 100644 index edf3feb..0000000 --- a/nixos/misc/time.nix +++ /dev/null @@ -1,5 +0,0 @@ -{ ... }: - -{ - time.timeZone = "America/New_York"; -} diff --git a/nixos/programs/dconf.nix b/nixos/programs/dconf.nix deleted file mode 100644 index 11c2c3b..0000000 --- a/nixos/programs/dconf.nix +++ /dev/null @@ -1,5 +0,0 @@ -{ ... }: - -{ - programs.dconf.enable = true; -} diff --git a/nixos/programs/gpg.nix b/nixos/programs/gpg.nix deleted file mode 100644 index 0ade0fc..0000000 --- a/nixos/programs/gpg.nix +++ /dev/null @@ -1,8 +0,0 @@ -{ ... }: - -{ - programs.gnupg.agent = { - enable = true; - enableSSHSupport = true; - }; -} diff --git a/nixos/programs/nix-ld.nix b/nixos/programs/nix-ld.nix deleted file mode 100644 index d178e51..0000000 --- a/nixos/programs/nix-ld.nix +++ /dev/null @@ -1,8 +0,0 @@ -{ pkgs, ... }: - -{ - programs.nix-ld = { - enable = true; - libraries = with pkgs; []; - }; -} diff --git a/nixos/programs/programs.nix b/nixos/programs/programs.nix deleted file mode 100644 index 6b2b27c..0000000 --- a/nixos/programs/programs.nix +++ /dev/null @@ -1,36 +0,0 @@ -{ pkgs, ... }: - -{ - imports = - [ - ./nix-ld.nix - ./dconf.nix - ./gpg.nix - ./steam.nix - ]; - - environment.systemPackages = with pkgs; [ - wget - curl - git - neovim - nerd-fonts.fira-code - cmake - ninja - libgcc - gnumake - topgrade - unzip - patchelf - wl-clipboard - jdk17 - jre8 - python3 - clang-tools - clang - libtool - libvterm - pkg-config - openssl - ]; -} diff --git a/nixos/programs/steam.nix b/nixos/programs/steam.nix deleted file mode 100644 index 3e50e04..0000000 --- a/nixos/programs/steam.nix +++ /dev/null @@ -1,5 +0,0 @@ -{ ... }: - -{ - programs.steam.enable = true; -} diff --git a/nixos/services/audio.nix b/nixos/services/audio.nix deleted file mode 100644 index 268a81c..0000000 --- a/nixos/services/audio.nix +++ /dev/null @@ -1,5 +0,0 @@ -{ ... }: - -{ - services.pulseaudio.enable = false; -} diff --git a/nixos/services/boot.nix b/nixos/services/boot.nix deleted file mode 100644 index 8e3bb56..0000000 --- a/nixos/services/boot.nix +++ /dev/null @@ -1,9 +0,0 @@ -{ ... }: - -{ - boot.loader.systemd-boot.enable = true; - boot.loader.systemd-boot.configurationLimit = 10; - boot.loader.systemd-boot.editor = false; - boot.loader.efi.efiSysMountPoint = "/boot"; - boot.loader.efi.canTouchEfiVariables = true; -} diff --git a/nixos/services/cups.nix b/nixos/services/cups.nix deleted file mode 100644 index 4610bde..0000000 --- a/nixos/services/cups.nix +++ /dev/null @@ -1,5 +0,0 @@ -{ ... }: - -{ - services.printing.enable = true; -} diff --git a/nixos/services/firewall.nix b/nixos/services/firewall.nix deleted file mode 100644 index 54168e7..0000000 --- a/nixos/services/firewall.nix +++ /dev/null @@ -1,7 +0,0 @@ -{ ... }: - -{ - networking.firewall.enable = false; - networking.firewall.allowedTCPPorts = []; - networking.firewall.allowedUDPPorts = []; -} diff --git a/nixos/services/libinput.nix b/nixos/services/libinput.nix deleted file mode 100644 index 4640b6d..0000000 --- a/nixos/services/libinput.nix +++ /dev/null @@ -1,5 +0,0 @@ -{ ... }: - -{ - services.libinput.enable = true; -} diff --git a/nixos/services/networkmanager.nix b/nixos/services/networkmanager.nix deleted file mode 100644 index 55ce0e4..0000000 --- a/nixos/services/networkmanager.nix +++ /dev/null @@ -1,6 +0,0 @@ -{ ... }: - -{ - networking.hostName = "nixos"; - networking.networkmanager.enable = true; -} diff --git a/nixos/services/pipewire.nix b/nixos/services/pipewire.nix deleted file mode 100644 index dcba83f..0000000 --- a/nixos/services/pipewire.nix +++ /dev/null @@ -1,11 +0,0 @@ -{ ... }: - -{ - services.pipewire = { - enable = true; - audio.enable = true; - pulse.enable = true; - alsa.enable = true; - alsa.support32Bit = true; - }; -} diff --git a/nixos/services/services.nix b/nixos/services/services.nix deleted file mode 100644 index 406d113..0000000 --- a/nixos/services/services.nix +++ /dev/null @@ -1,15 +0,0 @@ -{ ... }: - -{ - imports = - [ - ./boot.nix - ./pipewire.nix - ./cups.nix - ./firewall.nix - ./libinput.nix - ./networkmanager.nix - ]; - - services.flatpak.enable = true; -} diff --git a/nixos/users/luxzi.nix b/nixos/users/luxzi.nix deleted file mode 100644 index 587a5d3..0000000 --- a/nixos/users/luxzi.nix +++ /dev/null @@ -1,15 +0,0 @@ -{ self, pkgs, ... }: - -{ - users.users.luxzi = { - isNormalUser = true; - extraGroups = [ "wheel" ]; # Enable ‘sudo’ for the user. - shell = pkgs.zsh; - packages = [ - self.inputs.home-manager.packages.${pkgs.system}.home-manager - ]; - }; - - environment.shells = with pkgs; [ zsh ]; - programs.zsh.enable = true; -} diff --git a/overlays/default.nix b/overlays/default.nix new file mode 100644 index 0000000..3876dad --- /dev/null +++ b/overlays/default.nix @@ -0,0 +1,37 @@ +{inputs, ...}: { + # This one brings our custom packages from the 'pkgs' directory + additions = final: _prev: import ../pkgs final.pkgs; + + # This one contains whatever you want to overlay + # You can change versions, add patches, set compilation flags, anything really. + # https://nixos.wiki/wiki/Overlays + modifications = final: prev: { + prismlauncher = prev.prismlauncher.overrideAttrs (oldAttrs: { + buildInputs = (oldAttrs.buildInputs or []) ++ [final.jdk23]; + jdks = [ + final.jdk23 + ]; + # configurePhase = '' + # export JAVA_HOME=${pkgs.jdk22} + # ''; + # installPhase = '' + # mkdir -p $out/bin + # cp -r $oldAttrs.out/* $out/ + # # Create a wrapper script to ensure JAVA_HOME is set + # echo '#!/bin/sh' > $out/bin/prismlauncher + # echo "export JAVA_HOME=${pkgs.jdk22}" >> $out/bin/prismlauncher + # echo "exec $out/bin/PrismLauncher \"\$@\"" >> $out/bin/prismlauncher + # chmod +x $out/bin/prismlauncher + # ''; + }); + }; + + # When applied, the unstable nixpkgs set (declared in the flake inputs) will + # be accessible through 'pkgs.unstable' + unstable-packages = final: _prev: { + unstable = import inputs.nixpkgs-unstable { + system = final.system; + config.allowUnfree = true; + }; + }; +} diff --git a/pkgs/default.nix b/pkgs/default.nix new file mode 100644 index 0000000..3d9e23c --- /dev/null +++ b/pkgs/default.nix @@ -0,0 +1,5 @@ +# Custom packages, that can be defined similarly to ones from nixpkgs +# You can build them using 'nix build .#example' +pkgs: { + # example = pkgs.callPackage ./example { }; +} From a4924cfb7a0ea5897f046408cf1339c1e6b85bae Mon Sep 17 00:00:00 2001 From: lily Date: Sat, 29 Mar 2025 21:06:33 -0400 Subject: [PATCH 095/102] rm: overlays --- overlays/default.nix | 37 ------------------------------------- 1 file changed, 37 deletions(-) delete mode 100644 overlays/default.nix diff --git a/overlays/default.nix b/overlays/default.nix deleted file mode 100644 index 3876dad..0000000 --- a/overlays/default.nix +++ /dev/null @@ -1,37 +0,0 @@ -{inputs, ...}: { - # This one brings our custom packages from the 'pkgs' directory - additions = final: _prev: import ../pkgs final.pkgs; - - # This one contains whatever you want to overlay - # You can change versions, add patches, set compilation flags, anything really. - # https://nixos.wiki/wiki/Overlays - modifications = final: prev: { - prismlauncher = prev.prismlauncher.overrideAttrs (oldAttrs: { - buildInputs = (oldAttrs.buildInputs or []) ++ [final.jdk23]; - jdks = [ - final.jdk23 - ]; - # configurePhase = '' - # export JAVA_HOME=${pkgs.jdk22} - # ''; - # installPhase = '' - # mkdir -p $out/bin - # cp -r $oldAttrs.out/* $out/ - # # Create a wrapper script to ensure JAVA_HOME is set - # echo '#!/bin/sh' > $out/bin/prismlauncher - # echo "export JAVA_HOME=${pkgs.jdk22}" >> $out/bin/prismlauncher - # echo "exec $out/bin/PrismLauncher \"\$@\"" >> $out/bin/prismlauncher - # chmod +x $out/bin/prismlauncher - # ''; - }); - }; - - # When applied, the unstable nixpkgs set (declared in the flake inputs) will - # be accessible through 'pkgs.unstable' - unstable-packages = final: _prev: { - unstable = import inputs.nixpkgs-unstable { - system = final.system; - config.allowUnfree = true; - }; - }; -} From f645b12a6e5aaf139a576bdfed9ed909662040e5 Mon Sep 17 00:00:00 2001 From: lily Date: Sat, 29 Mar 2025 21:56:46 -0400 Subject: [PATCH 096/102] update: misc --- flake.lock | 23 ++- flake.nix | 5 +- home-manager/modules/chromium/default.nix | 27 ---- home-manager/modules/ghostty/default.nix | 37 ----- home-manager/modules/ghostty/shaders/crt.glsl | 153 ------------------ .../modules/ghostty/shaders/glow.glsl | 145 ----------------- home-manager/modules/git/default.nix | 6 +- home-manager/modules/kitty/default.nix | 22 +++ home-manager/modules/zed/default.nix | 103 ------------ home-manager/nix/home.nix | 7 +- home-manager/profiles/desktop.nix | 5 +- machines/nix/configuration.nix | 5 +- machines/nix/hardware-configuration.nix | 48 +++--- modules/hardware/nvidia.nix | 2 +- 14 files changed, 75 insertions(+), 513 deletions(-) delete mode 100644 home-manager/modules/chromium/default.nix delete mode 100644 home-manager/modules/ghostty/default.nix delete mode 100644 home-manager/modules/ghostty/shaders/crt.glsl delete mode 100644 home-manager/modules/ghostty/shaders/glow.glsl create mode 100644 home-manager/modules/kitty/default.nix delete mode 100644 home-manager/modules/zed/default.nix diff --git a/flake.lock b/flake.lock index f732535..d527f10 100644 --- a/flake.lock +++ b/flake.lock @@ -320,7 +320,8 @@ "nix-gaming": "nix-gaming", "nixpkgs": "nixpkgs_3", "nixpkgs-unstable": "nixpkgs-unstable", - "nixvim": "nixvim" + "nixvim": "nixvim", + "zen-browser": "zen-browser" } }, "systems": { @@ -352,6 +353,26 @@ "repo": "default", "type": "github" } + }, + "zen-browser": { + "inputs": { + "nixpkgs": [ + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1743216975, + "narHash": "sha256-29xgm8F3DCcTNrQZ9V3Pwj6BkjalkKvGyjd+sF9/+3k=", + "owner": "0xc000022070", + "repo": "zen-browser-flake", + "rev": "165ee672e6b17a8bcc0a3fb51fab3f79715cc1f3", + "type": "github" + }, + "original": { + "owner": "0xc000022070", + "repo": "zen-browser-flake", + "type": "github" + } } }, "root": "root", diff --git a/flake.nix b/flake.nix index ed0a138..90c4770 100644 --- a/flake.nix +++ b/flake.nix @@ -15,6 +15,8 @@ nixvim.url = "github:nix-community/nixvim"; nixvim.inputs.nixpkgs.follows = "nixpkgs"; nix-gaming.url = "github:fufexan/nix-gaming"; + zen-browser.url = "github:0xc000022070/zen-browser-flake"; + zen-browser.inputs.nixpkgs.follows = "nixpkgs"; }; outputs = { @@ -45,9 +47,6 @@ # Other options beside 'alejandra' include 'nixpkgs-fmt' formatter = forAllSystems (system: nixpkgs.legacyPackages.${system}.alejandra); - # Your custom packages and modifications, exported as overlays - overlays = import ./overlays {inherit inputs;}; - nixosModules = builtins.listToAttrs ( (map (x: { name = x; diff --git a/home-manager/modules/chromium/default.nix b/home-manager/modules/chromium/default.nix deleted file mode 100644 index 4bc2a70..0000000 --- a/home-manager/modules/chromium/default.nix +++ /dev/null @@ -1,27 +0,0 @@ -{ - config, - lib, - ... -}: let - cfg = config.lily.chromium; -in { - options.lily.chromium = { - enable = lib.mkEnableOption "activate chromium"; - }; - config = lib.mkIf cfg.enable { - programs.chromium = { - enable = true; - extensions = [ - {id = "cjpalhdlnbpafiamejdnhcphjbkeiagm";} # ublock origin - {id = "pkehgijcmpdhfbdbbnkijodmdjhbjlgp";} # privacy badger - {id = "ldpochfccmkkmhdbclfhpagapcfdljkj";} # decentraleyes - {id = "mnjggcdmjocbbbhaepdhchncahnbgone";} # sponsor block - {id = "gebbhagfogifgggkldgodflihgfeippi";} # return youtube dislike (just cuz) - ]; - commandLineArgs = [ - "--enable-features=UseOzonePlatform" - "--ozone-platform=wayland" - ]; - }; - }; -} diff --git a/home-manager/modules/ghostty/default.nix b/home-manager/modules/ghostty/default.nix deleted file mode 100644 index 5226865..0000000 --- a/home-manager/modules/ghostty/default.nix +++ /dev/null @@ -1,37 +0,0 @@ -{ - config, - lib, - ... -}: let - cfg = config.lily.ghostty; -in { - options.lily.ghostty = { - enable = lib.mkEnableOption "activate ghostty"; - }; - - config = lib.mkIf cfg.enable { - home.file.".config/ghostty/shaders" = { - source = ./shaders; - recursive = true; - }; - programs.ghostty = { - enable = true; - - settings = { - background-blur-radius = 0; - #theme = "dark:catppuccin-mocha,light:catppuccin-latte"; - window-theme = "dark"; - background-opacity = 0.75; - minimum-contrast = 1.1; - window-padding-x = 5; - window-padding-y = 5; - gtk-adwaita = false; - gtk-titlebar = false; - # custom-shader = "shaders/crt.glsl"; - # custom-shader = "shaders/glow.glsl"; - confirm-close-surface = false; - custom-shader-animation = true; - }; - }; - }; -} diff --git a/home-manager/modules/ghostty/shaders/crt.glsl b/home-manager/modules/ghostty/shaders/crt.glsl deleted file mode 100644 index ecce90d..0000000 --- a/home-manager/modules/ghostty/shaders/crt.glsl +++ /dev/null @@ -1,153 +0,0 @@ -// First it does a "chromatic aberration" by splitting the rgb signals by a product of sin functions -// over time, then it does a glow effect in a perceptual color space -// Based on kalgynirae's Ghostty passable glow shader and NickWest's Chromatic Aberration shader demo -// Passable glow: https://github.com/kalgynirae/dotfiles/blob/main/ghostty/glow.glsl -// "Chromatic Aberration": https://www.shadertoy.com/view/Mds3zn - -// sRGB linear -> nonlinear transform from https://bottosson.github.io/posts/colorwrong/ -float f(float x) { - if (x >= 0.0031308) { - return 1.055 * pow(x, 1.0 / 2.4) - 0.055; - } else { - return 12.92 * x; - } -} - -float f_inv(float x) { - if (x >= 0.04045) { - return pow((x + 0.055) / 1.055, 2.4); - } else { - return x / 12.92; - } -} - -// Oklab <-> linear sRGB conversions from https://bottosson.github.io/posts/oklab/ -vec4 toOklab(vec4 rgb) { - vec3 c = vec3(f_inv(rgb.r), f_inv(rgb.g), f_inv(rgb.b)); - float l = 0.4122214708 * c.r + 0.5363325363 * c.g + 0.0514459929 * c.b; - float m = 0.2119034982 * c.r + 0.6806995451 * c.g + 0.1073969566 * c.b; - float s = 0.0883024619 * c.r + 0.2817188376 * c.g + 0.6299787005 * c.b; - float l_ = pow(l, 1.0 / 3.0); - float m_ = pow(m, 1.0 / 3.0); - float s_ = pow(s, 1.0 / 3.0); - return vec4( - 0.2104542553 * l_ + 0.7936177850 * m_ - 0.0040720468 * s_, - 1.9779984951 * l_ - 2.4285922050 * m_ + 0.4505937099 * s_, - 0.0259040371 * l_ + 0.7827717662 * m_ - 0.8086757660 * s_, - rgb.a - ); -} - -vec4 toRgb(vec4 oklab) { - vec3 c = oklab.rgb; - float l_ = c.r + 0.3963377774 * c.g + 0.2158037573 * c.b; - float m_ = c.r - 0.1055613458 * c.g - 0.0638541728 * c.b; - float s_ = c.r - 0.0894841775 * c.g - 1.2914855480 * c.b; - float l = l_ * l_ * l_; - float m = m_ * m_ * m_; - float s = s_ * s_ * s_; - vec3 linear_srgb = vec3( - 4.0767416621 * l - 3.3077115913 * m + 0.2309699292 * s, - -1.2684380046 * l + 2.6097574011 * m - 0.3413193965 * s, - -0.0041960863 * l - 0.7034186147 * m + 1.7076147010 * s - ); - return vec4( - clamp(f(linear_srgb.r), 0.0, 1.0), - clamp(f(linear_srgb.g), 0.0, 1.0), - clamp(f(linear_srgb.b), 0.0, 1.0), - oklab.a - ); -} - -// Bloom samples from https://gist.github.com/qwerasd205/c3da6c610c8ffe17d6d2d3cc7068f17f -const vec3[24] samples = { - vec3(0.1693761725038636, 0.9855514761735895, 1), - vec3(-1.333070830962943, 0.4721463328627773, 0.7071067811865475), - vec3(-0.8464394909806497, -1.51113870578065, 0.5773502691896258), - vec3(1.554155680728463, -1.2588090085709776, 0.5), - vec3(1.681364377589461, 1.4741145918052656, 0.4472135954999579), - vec3(-1.2795157692199817, 2.088741103228784, 0.4082482904638631), - vec3(-2.4575847530631187, -0.9799373355024756, 0.3779644730092272), - vec3(0.5874641440200847, -2.7667464429345077, 0.35355339059327373), - vec3(2.997715703369726, 0.11704939884745152, 0.3333333333333333), - vec3(0.41360842451688395, 3.1351121305574803, 0.31622776601683794), - vec3(-3.167149933769243, 0.9844599011770256, 0.30151134457776363), - vec3(-1.5736713846521535, -3.0860263079123245, 0.2886751345948129), - vec3(2.888202648340422, -2.1583061557896213, 0.2773500981126146), - vec3(2.7150778983300325, 2.5745586041105715, 0.2672612419124244), - vec3(-2.1504069972377464, 3.2211410627650165, 0.2581988897471611), - vec3(-3.6548858794907493, -1.6253643308191343, 0.25), - vec3(1.0130775986052671, -3.9967078676335834, 0.24253562503633297), - vec3(4.229723673607257, 0.33081361055181563, 0.23570226039551587), - vec3(0.40107790291173834, 4.340407413572593, 0.22941573387056174), - vec3(-4.319124570236028, 1.159811599693438, 0.22360679774997896), - vec3(-1.9209044802827355, -4.160543952132907, 0.2182178902359924), - vec3(3.8639122286635708, -2.6589814382925123, 0.21320071635561041), - vec3(3.3486228404946234, 3.4331800232609, 0.20851441405707477), - vec3(-2.8769733643574344, 3.9652268864187157, 0.20412414523193154) -}; - -float offsetFunction(float iTime) { - float amount = 1.0; - const float periods[4] = {6.0, 16.0, 19.0, 27.0}; - for (int i = 0; i < 4; i++) { - amount *= 1.0 + 0.5 * sin(iTime*periods[i]); - } - //return amount; - return amount * periods[3]; -} - -const float DIM_CUTOFF = 0.35; -const float BRIGHT_CUTOFF = 0.65; -const float ABBERATION_FACTOR = 0.05; - -void mainImage(out vec4 fragColor, in vec2 fragCoord) { - vec2 uv = fragCoord.xy / iResolution.xy; - - // Sample the original color - vec4 originalColor = texture(iChannel0, uv); - - // Check if the pixel is part of the text (assuming alpha > 0.0) - if (originalColor.a > 0.0) { - float amount = offsetFunction(iTime); - - vec3 col; - col.r = texture( iChannel0, vec2(uv.x-ABBERATION_FACTOR*amount / iResolution.x, uv.y) ).r; - col.g = texture( iChannel0, uv ).g; - col.b = texture( iChannel0, vec2(uv.x+ABBERATION_FACTOR*amount / iResolution.x, uv.y) ).b; - - vec4 splittedColor = vec4(col, originalColor.a); // Keep the original alpha - vec4 source = toOklab(splittedColor); - vec4 dest = source; - - if (source.x > DIM_CUTOFF) { - dest.x *= 1.2; - // dest.x = 1.2; - } else { - vec2 step = vec2(1.414) / iResolution.xy; - vec3 glow = vec3(0.0); - for (int i = 0; i < 24; i++) { - vec3 s = samples[i]; - float weight = s.z; - vec4 c = toOklab(texture(iChannel0, uv + s.xy * step)); - if (c.x > DIM_CUTOFF) { - glow.yz += c.yz * weight * 0.3; - if (c.x <= BRIGHT_CUTOFF) { - glow.x += c.x * weight * 0.05; - } else { - glow.x += c.x * weight * 0.10; - } - } - } - // float lightness_diff = clamp(glow.x - dest.x, 0.0, 1.0); - // dest.x = lightness_diff; - // dest.yz = dest.yz * (1.0 - lightness_diff) + glow.yz * lightness_diff; - dest.xyz += glow.xyz; - } - - fragColor = toRgb(dest); - } else { - // If the pixel is background, set alpha to 0.0 for transparency - fragColor = vec4(originalColor.rgb, 0.0); - } -} diff --git a/home-manager/modules/ghostty/shaders/glow.glsl b/home-manager/modules/ghostty/shaders/glow.glsl deleted file mode 100644 index 83bef9c..0000000 --- a/home-manager/modules/ghostty/shaders/glow.glsl +++ /dev/null @@ -1,145 +0,0 @@ -// First it does a "chromatic aberration" by splitting the rgb signals by a product of sin functions -// over time, then it does a glow effect in a perceptual color space -// Based on kalgynirae's Ghostty passable glow shader and NickWest's Chromatic Aberration shader demo -// Passable glow: https://github.com/kalgynirae/dotfiles/blob/main/ghostty/glow.glsl -// "Chromatic Aberration": https://www.shadertoy.com/view/Mds3zn - -// sRGB linear -> nonlinear transform from https://bottosson.github.io/posts/colorwrong/ -float f(float x) { - if (x >= 0.0031308) { - return 1.055 * pow(x, 1.0 / 2.4) - 0.055; - } else { - return 12.92 * x; - } -} - -float f_inv(float x) { - if (x >= 0.04045) { - return pow((x + 0.055) / 1.055, 2.4); - } else { - return x / 12.92; - } -} - -// Oklab <-> linear sRGB conversions from https://bottosson.github.io/posts/oklab/ -vec4 toOklab(vec4 rgb) { - vec3 c = vec3(f_inv(rgb.r), f_inv(rgb.g), f_inv(rgb.b)); - float l = 0.4122214708 * c.r + 0.5363325363 * c.g + 0.0514459929 * c.b; - float m = 0.2119034982 * c.r + 0.6806995451 * c.g + 0.1073969566 * c.b; - float s = 0.0883024619 * c.r + 0.2817188376 * c.g + 0.6299787005 * c.b; - float l_ = pow(l, 1.0 / 3.0); - float m_ = pow(m, 1.0 / 3.0); - float s_ = pow(s, 1.0 / 3.0); - return vec4( - 0.2104542553 * l_ + 0.7936177850 * m_ - 0.0040720468 * s_, - 1.9779984951 * l_ - 2.4285922050 * m_ + 0.4505937099 * s_, - 0.0259040371 * l_ + 0.7827717662 * m_ - 0.8086757660 * s_, - rgb.a - ); -} - -vec4 toRgb(vec4 oklab) { - vec3 c = oklab.rgb; - float l_ = c.r + 0.3963377774 * c.g + 0.2158037573 * c.b; - float m_ = c.r - 0.1055613458 * c.g - 0.0638541728 * c.b; - float s_ = c.r - 0.0894841775 * c.g - 1.2914855480 * c.b; - float l = l_ * l_ * l_; - float m = m_ * m_ * m_; - float s = s_ * s_ * s_; - vec3 linear_srgb = vec3( - 4.0767416621 * l - 3.3077115913 * m + 0.2309699292 * s, - -1.2684380046 * l + 2.6097574011 * m - 0.3413193965 * s, - -0.0041960863 * l - 0.7034186147 * m + 1.7076147010 * s - ); - return vec4( - clamp(f(linear_srgb.r), 0.0, 1.0), - clamp(f(linear_srgb.g), 0.0, 1.0), - clamp(f(linear_srgb.b), 0.0, 1.0), - oklab.a - ); -} - -// Bloom samples from https://gist.github.com/qwerasd205/c3da6c610c8ffe17d6d2d3cc7068f17f -const vec3[24] samples = { - vec3(0.1693761725038636, 0.9855514761735895, 1), - vec3(-1.333070830962943, 0.4721463328627773, 0.7071067811865475), - vec3(-0.8464394909806497, -1.51113870578065, 0.5773502691896258), - vec3(1.554155680728463, -1.2588090085709776, 0.5), - vec3(1.681364377589461, 1.4741145918052656, 0.4472135954999579), - vec3(-1.2795157692199817, 2.088741103228784, 0.4082482904638631), - vec3(-2.4575847530631187, -0.9799373355024756, 0.3779644730092272), - vec3(0.5874641440200847, -2.7667464429345077, 0.35355339059327373), - vec3(2.997715703369726, 0.11704939884745152, 0.3333333333333333), - vec3(0.41360842451688395, 3.1351121305574803, 0.31622776601683794), - vec3(-3.167149933769243, 0.9844599011770256, 0.30151134457776363), - vec3(-1.5736713846521535, -3.0860263079123245, 0.2886751345948129), - vec3(2.888202648340422, -2.1583061557896213, 0.2773500981126146), - vec3(2.7150778983300325, 2.5745586041105715, 0.2672612419124244), - vec3(-2.1504069972377464, 3.2211410627650165, 0.2581988897471611), - vec3(-3.6548858794907493, -1.6253643308191343, 0.25), - vec3(1.0130775986052671, -3.9967078676335834, 0.24253562503633297), - vec3(4.229723673607257, 0.33081361055181563, 0.23570226039551587), - vec3(0.40107790291173834, 4.340407413572593, 0.22941573387056174), - vec3(-4.319124570236028, 1.159811599693438, 0.22360679774997896), - vec3(-1.9209044802827355, -4.160543952132907, 0.2182178902359924), - vec3(3.8639122286635708, -2.6589814382925123, 0.21320071635561041), - vec3(3.3486228404946234, 3.4331800232609, 0.20851441405707477), - vec3(-2.8769733643574344, 3.9652268864187157, 0.20412414523193154) -}; - -float offsetFunction(float iTime) { - float amount = 1.0; - const float periods[4] = {6.0, 16.0, 19.0, 27.0}; - for (int i = 0; i < 4; i++) { - amount *= 1.0 + 0.5 * sin(iTime*periods[i]); - } - //return amount; - return amount * periods[3]; -} - -const float DIM_CUTOFF = 0.35; -const float BRIGHT_CUTOFF = 0.65; -const float ABBERATION_FACTOR = 0.05; - -void mainImage(out vec4 fragColor, in vec2 fragCoord) { - vec2 uv = fragCoord.xy / iResolution.xy; - - float amount = offsetFunction(iTime); - - vec3 col; - col.r = texture( iChannel0, vec2(uv.x-ABBERATION_FACTOR*amount / iResolution.x, uv.y) ).r; - col.g = texture( iChannel0, uv ).g; - col.b = texture( iChannel0, vec2(uv.x+ABBERATION_FACTOR*amount / iResolution.x, uv.y) ).b; - - vec4 splittedColor = vec4(col, 1.0); - vec4 source = toOklab(splittedColor); - vec4 dest = source; - - if (source.x > DIM_CUTOFF) { - dest.x *= 1.2; - // dest.x = 1.2; - } else { - vec2 step = vec2(1.414) / iResolution.xy; - vec3 glow = vec3(0.0); - for (int i = 0; i < 24; i++) { - vec3 s = samples[i]; - float weight = s.z; - vec4 c = toOklab(texture(iChannel0, uv + s.xy * step)); - if (c.x > DIM_CUTOFF) { - glow.yz += c.yz * weight * 0.3; - if (c.x <= BRIGHT_CUTOFF) { - glow.x += c.x * weight * 0.05; - } else { - glow.x += c.x * weight * 0.10; - } - } - } - // float lightness_diff = clamp(glow.x - dest.x, 0.0, 1.0); - // dest.x = lightness_diff; - // dest.yz = dest.yz * (1.0 - lightness_diff) + glow.yz * lightness_diff; - dest.xyz += glow.xyz; - dest.a = 0.5; - } - - fragColor = toRgb(dest); -} diff --git a/home-manager/modules/git/default.nix b/home-manager/modules/git/default.nix index 9dd52b3..183f808 100644 --- a/home-manager/modules/git/default.nix +++ b/home-manager/modules/git/default.nix @@ -15,9 +15,9 @@ in { lfs.enable = true; extraConfig = { user = { - name = "Lily"; - email = "Caznix01@gmail.com"; - signingKey = "Caznix"; + name = "Lily Vex"; + email = "lesson085@gmail.com"; + signingKey = "Placeholder"; }; commit.gpgsign = true; init.defaultBranch = "main"; diff --git a/home-manager/modules/kitty/default.nix b/home-manager/modules/kitty/default.nix new file mode 100644 index 0000000..cf0b4c3 --- /dev/null +++ b/home-manager/modules/kitty/default.nix @@ -0,0 +1,22 @@ +{ + config, + lib, + ... +}: let + cfg = config.lily.kitty; +in { + options.lily.kitty = { + enable = lib.mkEnableOption "activate kitty"; + }; + + config = lib.mkIf cfg.enable { + programs.kitty = { + enable = true; + + settings = { + confirm_os_window_close = 0; + window_padding_width = 5; + }; + }; + }; +} diff --git a/home-manager/modules/zed/default.nix b/home-manager/modules/zed/default.nix deleted file mode 100644 index 9d3fe02..0000000 --- a/home-manager/modules/zed/default.nix +++ /dev/null @@ -1,103 +0,0 @@ -{ - config, - lib, - pkgs, - ... -}: let - cfg = config.lily.zed; -in { - options.lily.zed = { - enable = lib.mkEnableOption "activate zed"; - }; - - config = lib.mkIf cfg.enable { - programs.zed-editor = { - enable = true; - extensions = ["nix" "toml" "elixir" "make"]; - - ## everything inside of these brackets are Zed options. - userSettings = { - assistant = { - enabled = true; - version = "2"; - default_open_ai_model = null; - ### PROVIDER OPTIONS - ### zed.dev models { claude-3-5-sonnet-latest } requires github connected - ### anthropic models { claude-3-5-sonnet-latest claude-3-haiku-latest claude-3-opus-latest } requires API_KEY - ### copilot_chat models { gpt-4o gpt-4 gpt-3.5-turbo o1-preview } requires github connected - default_model = { - provider = "zed.dev"; - model = "claude-3-5-sonnet-latest"; - }; - - # inline_alternatives = [ - # { - # provider = "copilot_chat"; - # model = "gpt-3.5-turbo"; - # } - # ]; - }; - - node = { - path = lib.getExe pkgs.nodejs; - npm_path = lib.getExe' pkgs.nodejs "npm"; - }; - - hour_format = "hour24"; - auto_update = false; - terminal = { - alternate_scroll = "off"; - blinking = "off"; - copy_on_select = false; - dock = "bottom"; - detect_venv = { - on = { - directories = [".env" "env" ".venv" "venv"]; - activate_script = "default"; - }; - }; - font_family = "JetBrains Mono"; - font_features = null; - font_size = null; - line_height = "comfortable"; - option_as_meta = false; - button = false; - shell = { - program = "zsh"; - }; - toolbar = { - title = true; - }; - working_directory = "current_project_directory"; - }; - - lsp = { - rust-analyzer = { - binary = { - path = "/run/current-system/sw/bin/rust-analyzer"; - path_lookup = false; - }; - }; - nix = { - binary = { - path = "${pkgs.nixd}/bin/nixd"; - path_lookup = false; - }; - }; - }; - - vim_mode = false; # Not yet... - load_direnv = "shell_hook"; - base_keymap = "VSCode"; - theme = { - mode = "system"; - light = "One Light"; - dark = "Andromeda"; - }; - show_whitespaces = "all"; - ui_font_size = 16; - buffer_font_size = 16; - }; - }; - }; -} diff --git a/home-manager/nix/home.nix b/home-manager/nix/home.nix index b22df90..44c5b44 100644 --- a/home-manager/nix/home.nix +++ b/home-manager/nix/home.nix @@ -42,7 +42,7 @@ # Or define it inline, for example: # (final: prev: { # hi = final.hello.overrideAttrs (oldAttrs: { - # patches = [ ./change-hello-to-hi.patch ]; + # patches = [ ./change-hello-to-hi.patch ]; # }); # }) ]; @@ -57,15 +57,12 @@ username = "lily"; homeDirectory = "/home/lily"; packages = with pkgs; # installs a package - [ vesktop + inputs.zen-browser.packages."${system}".default (prismlauncher.override { jdks = [jdk23 jdk8 jdk17 jdk21]; }) - itch - inputs.nix-gaming.packages.${pkgs.system}.viper - kdePackages.kate ]; }; diff --git a/home-manager/profiles/desktop.nix b/home-manager/profiles/desktop.nix index 00cfd63..0118353 100644 --- a/home-manager/profiles/desktop.nix +++ b/home-manager/profiles/desktop.nix @@ -8,13 +8,10 @@ }; lily = { hyprland.enable = true; - ghostty.enable = true; + kitty.enable = true; neovim.enable = true; rofi.enable = true; - vscode.enable = true; - zed.enable = true; waybar.enable = true; - chromium.enable = true; }; home.packages = with pkgs; [ vesktop diff --git a/machines/nix/configuration.nix b/machines/nix/configuration.nix index 05600e5..1978450 100644 --- a/machines/nix/configuration.nix +++ b/machines/nix/configuration.nix @@ -25,12 +25,10 @@ ]; lily = { users.lily.enable = true; - laptop.enable = true; common.enable = true; containers = { enable = true; - podman = true; - # docker = false; + docker = true; }; nvidia.enable = true; desktop = { @@ -64,7 +62,6 @@ platformOptimizations.enable = true; localNetworkGameTransfers.openFirewall = true; gamescopeSession.enable = true; - extraCompatPackages = let gamePkgs = inputs.nix-gaming.packages.${pkgs.hostPlatform.system}; in [pkgs.proton-ge-bin gamePkgs.northstar-proton]; }; }; diff --git a/machines/nix/hardware-configuration.nix b/machines/nix/hardware-configuration.nix index 6be9341..8ca010a 100644 --- a/machines/nix/hardware-configuration.nix +++ b/machines/nix/hardware-configuration.nix @@ -1,44 +1,38 @@ # 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, ... }: + { - config, - lib, - pkgs, - modulesPath, - ... -}: { - imports = [ - (modulesPath + "/installer/scan/not-detected.nix") - ]; + imports = + [ (modulesPath + "/installer/scan/not-detected.nix") + ]; - boot.initrd.availableKernelModules = ["xhci_pci" "thunderbolt" "nvme" "usb_storage" "usbhid" "sd_mod" "rtsx_pci_sdmmc"]; - boot.initrd.kernelModules = []; - boot.kernelModules = ["kvm-intel"]; - boot.extraModulePackages = []; + boot.initrd.availableKernelModules = [ "xhci_pci" "ahci" "nvme" "usbhid" "sd_mod" ]; + boot.initrd.kernelModules = [ ]; + boot.kernelModules = [ "kvm-intel" ]; + boot.extraModulePackages = [ ]; - fileSystems."/" = { - device = "/dev/disk/by-uuid/95c3ec11-8329-4b54-a690-97c31250a110"; - fsType = "btrfs"; - options = ["subvol=@"]; - }; + fileSystems."/" = + { device = "/dev/disk/by-uuid/c42aa8fb-f19a-41eb-9ff3-f77d4c1d7ba7"; + fsType = "ext4"; + }; - fileSystems."/boot" = { - device = "/dev/disk/by-uuid/9666-823F"; - fsType = "vfat"; - options = ["fmask=0077" "dmask=0077"]; - }; + fileSystems."/boot" = + { device = "/dev/disk/by-uuid/F2AC-C759"; + fsType = "vfat"; + options = [ "fmask=0022" "dmask=0022" ]; + }; - swapDevices = [ - {device = "/dev/disk/by-uuid/5fd02c5b-4ce0-46be-8771-9c1b0d280d8d";} - ]; + swapDevices = [ ]; # 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.wlp92s0.useDHCP = lib.mkDefault true; + # networking.interfaces.enp2s0.useDHCP = lib.mkDefault true; + # networking.interfaces.wlp3s0.useDHCP = lib.mkDefault true; nixpkgs.hostPlatform = lib.mkDefault "x86_64-linux"; hardware.cpu.intel.updateMicrocode = lib.mkDefault config.hardware.enableRedistributableFirmware; diff --git a/modules/hardware/nvidia.nix b/modules/hardware/nvidia.nix index c57a737..37ae81c 100644 --- a/modules/hardware/nvidia.nix +++ b/modules/hardware/nvidia.nix @@ -57,7 +57,7 @@ in { # https://github.com/NVIDIA/open-gpu-kernel-modules#compatible-gpus # Only available from driver 515.43.04+ # Currently alpha-quality/buggy, so false is currently the recommended setting. - open = true; + open = false; # Optionally, you may need to select the appropriate driver version for your specific GPU. package = config.boot.kernelPackages.nvidiaPackages.stable; From fa9b64ed9389d1766e5b33b8b477a1cabb476c16 Mon Sep 17 00:00:00 2001 From: lily Date: Sat, 29 Mar 2025 23:27:46 -0400 Subject: [PATCH 097/102] fix: incorrect gpg key and home-manager package location --- flake.lock | 62 ++++++++++++++--------- flake.nix | 1 - home-manager/modules/git/default.nix | 2 +- home-manager/modules/hyprland/default.nix | 2 +- home-manager/nix/home.nix | 12 ----- home-manager/profiles/desktop.nix | 4 +- machines/nix/hardware-configuration.nix | 6 +-- modules/common/common.nix | 3 +- 8 files changed, 47 insertions(+), 45 deletions(-) diff --git a/flake.lock b/flake.lock index d527f10..caf3549 100644 --- a/flake.lock +++ b/flake.lock @@ -128,11 +128,11 @@ ] }, "locked": { - "lastModified": 1742234739, - "narHash": "sha256-zFL6zsf/5OztR1NSNQF33dvS1fL/BzVUjabZq4qrtY4=", + "lastModified": 1742655702, + "narHash": "sha256-jbqlw4sPArFtNtA1s3kLg7/A4fzP4GLk9bGbtUJg0JQ=", "owner": "nix-community", "repo": "home-manager", - "rev": "f6af7280a3390e65c2ad8fd059cdc303426cbd59", + "rev": "0948aeedc296f964140d9429223c7e4a0702a1ff", "type": "github" }, "original": { @@ -176,11 +176,11 @@ "nixpkgs": "nixpkgs_2" }, "locked": { - "lastModified": 1742262357, - "narHash": "sha256-6JGR5I4cuFFun3AJKPnMPz6PKUPywIH+AFYROUFRvYQ=", + "lastModified": 1743299372, + "narHash": "sha256-vFuxkHPd+Xpi5Bx1VCyZwYl/BbF83C+KmlbPBNVJvNU=", "owner": "fufexan", "repo": "nix-gaming", - "rev": "53eda8bba79a2c28782734bca51d70ecffb82d74", + "rev": "2ab0a37308559926bddb0009dfcf16a2a5b34e2b", "type": "github" }, "original": { @@ -222,11 +222,11 @@ }, "nixpkgs-unstable": { "locked": { - "lastModified": 1742288794, - "narHash": "sha256-Txwa5uO+qpQXrNG4eumPSD+hHzzYi/CdaM80M9XRLCo=", + "lastModified": 1743095683, + "narHash": "sha256-gWd4urRoLRe8GLVC/3rYRae1h+xfQzt09xOfb0PaHSk=", "owner": "nixos", "repo": "nixpkgs", - "rev": "b6eaf97c6960d97350c584de1b6dcff03c9daf42", + "rev": "5e5402ecbcb27af32284d4a62553c019a3a49ea6", "type": "github" }, "original": { @@ -238,11 +238,11 @@ }, "nixpkgs_2": { "locked": { - "lastModified": 1741865919, - "narHash": "sha256-4thdbnP6dlbdq+qZWTsm4ffAwoS8Tiq1YResB+RP6WE=", + "lastModified": 1743076231, + "narHash": "sha256-yQugdVfi316qUfqzN8JMaA2vixl+45GxNm4oUfXlbgw=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "573c650e8a14b2faa0041645ab18aed7e60f0c9a", + "rev": "6c5963357f3c1c840201eda129a99d455074db04", "type": "github" }, "original": { @@ -254,11 +254,11 @@ }, "nixpkgs_3": { "locked": { - "lastModified": 1742268799, - "narHash": "sha256-IhnK4LhkBlf14/F8THvUy3xi/TxSQkp9hikfDZRD4Ic=", + "lastModified": 1743231893, + "narHash": "sha256-tpJsHMUPEhEnzySoQxx7+kA+KUtgWqvlcUBqROYNNt0=", "owner": "nixos", "repo": "nixpkgs", - "rev": "da044451c6a70518db5b730fe277b70f494188f1", + "rev": "c570c1f5304493cafe133b8d843c7c1c4a10d3a6", "type": "github" }, "original": { @@ -268,6 +268,22 @@ "type": "github" } }, + "nixpkgs_4": { + "locked": { + "lastModified": 1743095683, + "narHash": "sha256-gWd4urRoLRe8GLVC/3rYRae1h+xfQzt09xOfb0PaHSk=", + "owner": "nixos", + "repo": "nixpkgs", + "rev": "5e5402ecbcb27af32284d4a62553c019a3a49ea6", + "type": "github" + }, + "original": { + "owner": "nixos", + "ref": "nixos-unstable", + "repo": "nixpkgs", + "type": "github" + } + }, "nixvim": { "inputs": { "flake-parts": "flake-parts_2", @@ -277,11 +293,11 @@ "nuschtosSearch": "nuschtosSearch" }, "locked": { - "lastModified": 1742396414, - "narHash": "sha256-e9Uv44rVDAG2ohNejttl9Pq5r4dxIzWxt+1hvKTQK5E=", + "lastModified": 1743288994, + "narHash": "sha256-hUlfAcIUnS8/eSFq+uzOHPZO1p8QgBTAoqhDWzEkUto=", "owner": "nix-community", "repo": "nixvim", - "rev": "d79c291d5d80d587d518e0f530cc55adb0638c80", + "rev": "81fdde9fc529e0a5f9ff0d570f31acfe85fd20ac", "type": "github" }, "original": { @@ -300,11 +316,11 @@ ] }, "locked": { - "lastModified": 1741886583, - "narHash": "sha256-sScfYKtxp3CYv5fJcHQDvQjqBL+tPNQqS9yf9Putd+s=", + "lastModified": 1742659553, + "narHash": "sha256-i/JCrr/jApVorI9GkSV5to+USrRCa0rWuQDH8JSlK2A=", "owner": "NuschtOS", "repo": "search", - "rev": "2974bc5fa3441a319fba943f3ca41f7dcd1a1467", + "rev": "508752835128a3977985a4d5225ff241f7756181", "type": "github" }, "original": { @@ -356,9 +372,7 @@ }, "zen-browser": { "inputs": { - "nixpkgs": [ - "nixpkgs" - ] + "nixpkgs": "nixpkgs_4" }, "locked": { "lastModified": 1743216975, diff --git a/flake.nix b/flake.nix index 90c4770..ef851be 100644 --- a/flake.nix +++ b/flake.nix @@ -16,7 +16,6 @@ nixvim.inputs.nixpkgs.follows = "nixpkgs"; nix-gaming.url = "github:fufexan/nix-gaming"; zen-browser.url = "github:0xc000022070/zen-browser-flake"; - zen-browser.inputs.nixpkgs.follows = "nixpkgs"; }; outputs = { diff --git a/home-manager/modules/git/default.nix b/home-manager/modules/git/default.nix index 183f808..76d4e61 100644 --- a/home-manager/modules/git/default.nix +++ b/home-manager/modules/git/default.nix @@ -17,7 +17,7 @@ in { user = { name = "Lily Vex"; email = "lesson085@gmail.com"; - signingKey = "Placeholder"; + signingKey = "Lily Vex"; }; commit.gpgsign = true; init.defaultBranch = "main"; diff --git a/home-manager/modules/hyprland/default.nix b/home-manager/modules/hyprland/default.nix index 1651a5c..2854dcd 100644 --- a/home-manager/modules/hyprland/default.nix +++ b/home-manager/modules/hyprland/default.nix @@ -58,7 +58,7 @@ in { "$alt_super $super,Q,exit" # Screenshot region "$super SHIFT,S, exec, GRIM_DEFAULT_DIR=${config.home.homeDirectory}/Pictures/Screenshots/ ${pkgs.grim}/bin/grim -g \"$(${pkgs.slurp}/bin/slurp)\" - | wl-copy " - "$super,T, exec, ghostty" + "$super,T, exec, kitty" "$super, L,exec, hyprlock --immediate" "$super, B,exec, chromium" "$super,F,fullscreen" diff --git a/home-manager/nix/home.nix b/home-manager/nix/home.nix index 44c5b44..b37dd61 100644 --- a/home-manager/nix/home.nix +++ b/home-manager/nix/home.nix @@ -17,12 +17,8 @@ # You can also split up your configuration and import pieces of it here: # ./nvim.nix ../applications/git.nix - ../applications/chromium.nix - ../applications/git.nix ../applications/zsh.nix ../applications/direnv.nix - ../applications/vscode.nix - ../applications/ghostty ../applications/hyprland ../applications/neovim inputs.nixvim.homeManagerModules.nixvim @@ -56,14 +52,6 @@ home = { username = "lily"; homeDirectory = "/home/lily"; - packages = with pkgs; # installs a package - [ - vesktop - inputs.zen-browser.packages."${system}".default - (prismlauncher.override { - jdks = [jdk23 jdk8 jdk17 jdk21]; - }) - ]; }; # Add stuff for your user as you see fit: diff --git a/home-manager/profiles/desktop.nix b/home-manager/profiles/desktop.nix index 0118353..3755a57 100644 --- a/home-manager/profiles/desktop.nix +++ b/home-manager/profiles/desktop.nix @@ -1,4 +1,4 @@ -{pkgs, ...}: { +{pkgs, inputs, ...}: { imports = [ ./main.nix ]; @@ -15,5 +15,7 @@ }; home.packages = with pkgs; [ vesktop + inputs.zen-browser.packages."${system}".default + hyfetch ]; } diff --git a/machines/nix/hardware-configuration.nix b/machines/nix/hardware-configuration.nix index 8ca010a..947cd48 100644 --- a/machines/nix/hardware-configuration.nix +++ b/machines/nix/hardware-configuration.nix @@ -8,18 +8,18 @@ [ (modulesPath + "/installer/scan/not-detected.nix") ]; - boot.initrd.availableKernelModules = [ "xhci_pci" "ahci" "nvme" "usbhid" "sd_mod" ]; + boot.initrd.availableKernelModules = [ "xhci_pci" "ahci" "nvme" "usbhid" "usb_storage" "sd_mod" ]; boot.initrd.kernelModules = [ ]; boot.kernelModules = [ "kvm-intel" ]; boot.extraModulePackages = [ ]; fileSystems."/" = - { device = "/dev/disk/by-uuid/c42aa8fb-f19a-41eb-9ff3-f77d4c1d7ba7"; + { device = "/dev/disk/by-uuid/352a9d74-fd89-4117-bfde-f7cc6573e6da"; fsType = "ext4"; }; fileSystems."/boot" = - { device = "/dev/disk/by-uuid/F2AC-C759"; + { device = "/dev/disk/by-uuid/6080-50C4"; fsType = "vfat"; options = [ "fmask=0022" "dmask=0022" ]; }; diff --git a/modules/common/common.nix b/modules/common/common.nix index f8dd76f..3e5c2b3 100644 --- a/modules/common/common.nix +++ b/modules/common/common.nix @@ -12,7 +12,7 @@ in { enable = true; enableSSHSupport = true; }; - services.openssh.enable = true; + services.openssh.enable = false; programs.zsh.enable = true; environment.systemPackages = with pkgs; [ git @@ -20,7 +20,6 @@ in { toybox util-linux tmux - ghostty # encryption and filesystem cryptsetup From 5703f07a33d7b7fec56d25ca0d2225aef49b341d Mon Sep 17 00:00:00 2001 From: lily Date: Sun, 30 Mar 2025 00:25:15 -0400 Subject: [PATCH 098/102] misc: formatting changes --- flake.lock | 81 +++++++++++++++++++++++++--- home-manager/modules/git/default.nix | 2 +- modules/plasma/default.nix | 2 + 3 files changed, 78 insertions(+), 7 deletions(-) diff --git a/flake.lock b/flake.lock index caf3549..37585c5 100644 --- a/flake.lock +++ b/flake.lock @@ -84,7 +84,7 @@ }, "flake-utils": { "inputs": { - "systems": "systems_2" + "systems": "systems_3" }, "locked": { "lastModified": 1731533236, @@ -170,10 +170,29 @@ "type": "github" } }, + "kwin-effects-forceblur": { + "inputs": { + "nixpkgs": "nixpkgs_2", + "utils": "utils" + }, + "locked": { + "lastModified": 1740651704, + "narHash": "sha256-s6pe3osipbo+GZVAB6LycyOsYcdvC12OJzuQRVptVZE=", + "owner": "taj-ny", + "repo": "kwin-effects-forceblur", + "rev": "1c8dcf1a471b13ada1e37f468de71e115148353f", + "type": "github" + }, + "original": { + "owner": "taj-ny", + "repo": "kwin-effects-forceblur", + "type": "github" + } + }, "nix-gaming": { "inputs": { "flake-parts": "flake-parts", - "nixpkgs": "nixpkgs_2" + "nixpkgs": "nixpkgs_3" }, "locked": { "lastModified": 1743299372, @@ -237,6 +256,22 @@ } }, "nixpkgs_2": { + "locked": { + "lastModified": 1730200266, + "narHash": "sha256-l253w0XMT8nWHGXuXqyiIC/bMvh1VRszGXgdpQlfhvU=", + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "807e9154dcb16384b1b765ebe9cd2bba2ac287fd", + "type": "github" + }, + "original": { + "owner": "NixOS", + "ref": "nixos-unstable", + "repo": "nixpkgs", + "type": "github" + } + }, + "nixpkgs_3": { "locked": { "lastModified": 1743076231, "narHash": "sha256-yQugdVfi316qUfqzN8JMaA2vixl+45GxNm4oUfXlbgw=", @@ -252,7 +287,7 @@ "type": "github" } }, - "nixpkgs_3": { + "nixpkgs_4": { "locked": { "lastModified": 1743231893, "narHash": "sha256-tpJsHMUPEhEnzySoQxx7+kA+KUtgWqvlcUBqROYNNt0=", @@ -268,7 +303,7 @@ "type": "github" } }, - "nixpkgs_4": { + "nixpkgs_5": { "locked": { "lastModified": 1743095683, "narHash": "sha256-gWd4urRoLRe8GLVC/3rYRae1h+xfQzt09xOfb0PaHSk=", @@ -333,8 +368,9 @@ "inputs": { "agenix": "agenix", "home-manager": "home-manager_2", + "kwin-effects-forceblur": "kwin-effects-forceblur", "nix-gaming": "nix-gaming", - "nixpkgs": "nixpkgs_3", + "nixpkgs": "nixpkgs_4", "nixpkgs-unstable": "nixpkgs-unstable", "nixvim": "nixvim", "zen-browser": "zen-browser" @@ -370,9 +406,42 @@ "type": "github" } }, + "systems_3": { + "locked": { + "lastModified": 1681028828, + "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=", + "owner": "nix-systems", + "repo": "default", + "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e", + "type": "github" + }, + "original": { + "owner": "nix-systems", + "repo": "default", + "type": "github" + } + }, + "utils": { + "inputs": { + "systems": "systems_2" + }, + "locked": { + "lastModified": 1726560853, + "narHash": "sha256-X6rJYSESBVr3hBoH0WbKE5KvhPU5bloyZ2L4K60/fPQ=", + "owner": "numtide", + "repo": "flake-utils", + "rev": "c1dfcf08411b08f6b8615f7d8971a2bfa81d5e8a", + "type": "github" + }, + "original": { + "owner": "numtide", + "repo": "flake-utils", + "type": "github" + } + }, "zen-browser": { "inputs": { - "nixpkgs": "nixpkgs_4" + "nixpkgs": "nixpkgs_5" }, "locked": { "lastModified": 1743216975, diff --git a/home-manager/modules/git/default.nix b/home-manager/modules/git/default.nix index 76d4e61..fefbd88 100644 --- a/home-manager/modules/git/default.nix +++ b/home-manager/modules/git/default.nix @@ -15,7 +15,7 @@ in { lfs.enable = true; extraConfig = { user = { - name = "Lily Vex"; + name = "lily"; email = "lesson085@gmail.com"; signingKey = "Lily Vex"; }; diff --git a/modules/plasma/default.nix b/modules/plasma/default.nix index 463113f..2939da2 100644 --- a/modules/plasma/default.nix +++ b/modules/plasma/default.nix @@ -1,6 +1,8 @@ { lib, config, + pkgs, + inputs, ... }: let cfg = config.lily.plasma; From c8b70b59f7172a57e0779f8d2a3ba7f09f809d84 Mon Sep 17 00:00:00 2001 From: lily Date: Tue, 1 Apr 2025 12:16:35 -0400 Subject: [PATCH 099/102] add: customize waybar --- flake.lock | 124 +++-------- flake.nix | 4 +- home-manager/modules/hyprland/default.nix | 19 +- home-manager/modules/kitty/default.nix | 3 + home-manager/modules/neovim/default.nix | 2 +- home-manager/modules/waybar/default.nix | 165 +++++++++++++- home-manager/modules/waybar/default.nix.old | 203 ++++++++++++++++++ home-manager/modules/waybar/style.css | 108 ++++++++++ home-manager/modules/waybar/style.css.old | 153 +++++++++++++ .../waybar/themes/Catppuccin-Latte.css | 26 +++ .../waybar/themes/Catppuccin-Mocha.css | 25 +++ home-manager/modules/waybar/themes/theme.css | 26 +++ home-manager/profiles/desktop.nix | 6 + modules/common/desktop.nix | 10 +- modules/wayland/default.nix | 2 +- 15 files changed, 754 insertions(+), 122 deletions(-) create mode 100644 home-manager/modules/waybar/default.nix.old create mode 100644 home-manager/modules/waybar/style.css create mode 100644 home-manager/modules/waybar/style.css.old create mode 100644 home-manager/modules/waybar/themes/Catppuccin-Latte.css create mode 100644 home-manager/modules/waybar/themes/Catppuccin-Mocha.css create mode 100644 home-manager/modules/waybar/themes/theme.css diff --git a/flake.lock b/flake.lock index 37585c5..a8aa53d 100644 --- a/flake.lock +++ b/flake.lock @@ -84,7 +84,7 @@ }, "flake-utils": { "inputs": { - "systems": "systems_3" + "systems": "systems_2" }, "locked": { "lastModified": 1731533236, @@ -128,16 +128,15 @@ ] }, "locked": { - "lastModified": 1742655702, - "narHash": "sha256-jbqlw4sPArFtNtA1s3kLg7/A4fzP4GLk9bGbtUJg0JQ=", + "lastModified": 1743360001, + "narHash": "sha256-HtpS/ZdgWXw0y+aFdORcX5RuBGTyz3WskThspNR70SM=", "owner": "nix-community", "repo": "home-manager", - "rev": "0948aeedc296f964140d9429223c7e4a0702a1ff", + "rev": "b6fd653ef8fbeccfd4958650757e91767a65506d", "type": "github" }, "original": { "owner": "nix-community", - "ref": "release-24.11", "repo": "home-manager", "type": "github" } @@ -170,29 +169,10 @@ "type": "github" } }, - "kwin-effects-forceblur": { - "inputs": { - "nixpkgs": "nixpkgs_2", - "utils": "utils" - }, - "locked": { - "lastModified": 1740651704, - "narHash": "sha256-s6pe3osipbo+GZVAB6LycyOsYcdvC12OJzuQRVptVZE=", - "owner": "taj-ny", - "repo": "kwin-effects-forceblur", - "rev": "1c8dcf1a471b13ada1e37f468de71e115148353f", - "type": "github" - }, - "original": { - "owner": "taj-ny", - "repo": "kwin-effects-forceblur", - "type": "github" - } - }, "nix-gaming": { "inputs": { "flake-parts": "flake-parts", - "nixpkgs": "nixpkgs_3" + "nixpkgs": "nixpkgs_2" }, "locked": { "lastModified": 1743299372, @@ -256,22 +236,6 @@ } }, "nixpkgs_2": { - "locked": { - "lastModified": 1730200266, - "narHash": "sha256-l253w0XMT8nWHGXuXqyiIC/bMvh1VRszGXgdpQlfhvU=", - "owner": "NixOS", - "repo": "nixpkgs", - "rev": "807e9154dcb16384b1b765ebe9cd2bba2ac287fd", - "type": "github" - }, - "original": { - "owner": "NixOS", - "ref": "nixos-unstable", - "repo": "nixpkgs", - "type": "github" - } - }, - "nixpkgs_3": { "locked": { "lastModified": 1743076231, "narHash": "sha256-yQugdVfi316qUfqzN8JMaA2vixl+45GxNm4oUfXlbgw=", @@ -287,23 +251,7 @@ "type": "github" } }, - "nixpkgs_4": { - "locked": { - "lastModified": 1743231893, - "narHash": "sha256-tpJsHMUPEhEnzySoQxx7+kA+KUtgWqvlcUBqROYNNt0=", - "owner": "nixos", - "repo": "nixpkgs", - "rev": "c570c1f5304493cafe133b8d843c7c1c4a10d3a6", - "type": "github" - }, - "original": { - "owner": "nixos", - "ref": "nixos-24.11", - "repo": "nixpkgs", - "type": "github" - } - }, - "nixpkgs_5": { + "nixpkgs_3": { "locked": { "lastModified": 1743095683, "narHash": "sha256-gWd4urRoLRe8GLVC/3rYRae1h+xfQzt09xOfb0PaHSk=", @@ -319,6 +267,22 @@ "type": "github" } }, + "nixpkgs_4": { + "locked": { + "lastModified": 1742288794, + "narHash": "sha256-Txwa5uO+qpQXrNG4eumPSD+hHzzYi/CdaM80M9XRLCo=", + "owner": "nixos", + "repo": "nixpkgs", + "rev": "b6eaf97c6960d97350c584de1b6dcff03c9daf42", + "type": "github" + }, + "original": { + "owner": "nixos", + "ref": "nixos-unstable", + "repo": "nixpkgs", + "type": "github" + } + }, "nixvim": { "inputs": { "flake-parts": "flake-parts_2", @@ -328,11 +292,11 @@ "nuschtosSearch": "nuschtosSearch" }, "locked": { - "lastModified": 1743288994, - "narHash": "sha256-hUlfAcIUnS8/eSFq+uzOHPZO1p8QgBTAoqhDWzEkUto=", + "lastModified": 1743362786, + "narHash": "sha256-XbXIRDbb8/vLBX1M096l7lM5wfzBTp1ZXfUl9bUhVGU=", "owner": "nix-community", "repo": "nixvim", - "rev": "81fdde9fc529e0a5f9ff0d570f31acfe85fd20ac", + "rev": "d81f37256d0a8691b837b74979d27bf89be8ecdd", "type": "github" }, "original": { @@ -368,9 +332,8 @@ "inputs": { "agenix": "agenix", "home-manager": "home-manager_2", - "kwin-effects-forceblur": "kwin-effects-forceblur", "nix-gaming": "nix-gaming", - "nixpkgs": "nixpkgs_4", + "nixpkgs": "nixpkgs_3", "nixpkgs-unstable": "nixpkgs-unstable", "nixvim": "nixvim", "zen-browser": "zen-browser" @@ -406,42 +369,9 @@ "type": "github" } }, - "systems_3": { - "locked": { - "lastModified": 1681028828, - "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=", - "owner": "nix-systems", - "repo": "default", - "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e", - "type": "github" - }, - "original": { - "owner": "nix-systems", - "repo": "default", - "type": "github" - } - }, - "utils": { - "inputs": { - "systems": "systems_2" - }, - "locked": { - "lastModified": 1726560853, - "narHash": "sha256-X6rJYSESBVr3hBoH0WbKE5KvhPU5bloyZ2L4K60/fPQ=", - "owner": "numtide", - "repo": "flake-utils", - "rev": "c1dfcf08411b08f6b8615f7d8971a2bfa81d5e8a", - "type": "github" - }, - "original": { - "owner": "numtide", - "repo": "flake-utils", - "type": "github" - } - }, "zen-browser": { "inputs": { - "nixpkgs": "nixpkgs_5" + "nixpkgs": "nixpkgs_4" }, "locked": { "lastModified": 1743216975, diff --git a/flake.nix b/flake.nix index ef851be..1d651bb 100644 --- a/flake.nix +++ b/flake.nix @@ -3,14 +3,14 @@ inputs = { # Nixpkgs - nixpkgs.url = "github:nixos/nixpkgs/nixos-24.11"; + nixpkgs.url = "github:nixos/nixpkgs/nixos-unstable"; # You can access packages and modules from different nixpkgs revs # at the same time. Here's an working example: nixpkgs-unstable.url = "github:nixos/nixpkgs/nixos-unstable"; # Also see the 'unstable-packages' overlay at 'overlays/default.nix'. # Home manager home-manager.inputs.nixpkgs.follows = "nixpkgs"; - home-manager.url = "github:nix-community/home-manager/release-24.11"; + home-manager.url = "github:nix-community/home-manager"; agenix.url = "github:ryantm/agenix"; nixvim.url = "github:nix-community/nixvim"; nixvim.inputs.nixpkgs.follows = "nixpkgs"; diff --git a/home-manager/modules/hyprland/default.nix b/home-manager/modules/hyprland/default.nix index 2854dcd..ee97670 100644 --- a/home-manager/modules/hyprland/default.nix +++ b/home-manager/modules/hyprland/default.nix @@ -30,7 +30,7 @@ in { xray = true; }; }; - blurls = "waybar"; + # blurls = "waybar"; dwindle = { pseudotile = true; # Master switch for pseudotiling. Enabling is bound to mainMod + P in the keybinds section below preserve_split = true; # You probably want this @@ -40,8 +40,8 @@ in { extend_border_grab_area = 15; # Extends the clickable area around the border for resizing hover_icon_on_border = true; # Shows a cursor icon when layout = "dwindle"; - "col.active_border" = "rgba(C55900ee) rgba(FFAA63ee) 45deg"; - "col.inactive_border" = "rgba(595959aa)"; + "col.active_border" = "rgba(3A2BABFF) rgba(1A0B8AFF) 45deg"; + "col.inactive_border" = "rgba(110E29aa)"; border_size = 2; gaps_out = 10; }; @@ -49,6 +49,7 @@ in { "${pkgs.kdePackages.kwallet-pam}/libexec/pam_kwallet_init" "${pkgs.networkmanagerapplet}/bin/nm-applet" "${pkgs.blueman}/bin/blueman-applet" + "${pkgs.waybar}/bin/waybar" ]; "$super" = "SUPER"; "$alt_super" = "CTRL"; @@ -59,8 +60,8 @@ in { # Screenshot region "$super SHIFT,S, exec, GRIM_DEFAULT_DIR=${config.home.homeDirectory}/Pictures/Screenshots/ ${pkgs.grim}/bin/grim -g \"$(${pkgs.slurp}/bin/slurp)\" - | wl-copy " "$super,T, exec, kitty" - "$super, L,exec, hyprlock --immediate" - "$super, B,exec, chromium" + "$alt_super $super, L,exec, hyprlock --immediate" + "$super, B,exec, zen" "$super,F,fullscreen" "$super SHIFT,F,togglefloating" "$super,E,exec,kate" @@ -93,10 +94,10 @@ in { "$super, J, togglesplit" - "$super, left, movefocus, l" - "$super, right, movefocus, r" - "$super, up, movefocus, u" - "$super, down, movefocus, d" + "$super, h, movefocus, l" + "$super, l, movefocus, r" + "$super, k, movefocus, u" + "$super, j, movefocus, d" ]; bindm = [ "$super, mouse:272, movewindow" diff --git a/home-manager/modules/kitty/default.nix b/home-manager/modules/kitty/default.nix index cf0b4c3..041a9f8 100644 --- a/home-manager/modules/kitty/default.nix +++ b/home-manager/modules/kitty/default.nix @@ -16,6 +16,9 @@ in { settings = { confirm_os_window_close = 0; window_padding_width = 5; + background_opacity = "0.45"; + background_blur = 1; + dynamic_background_opacity = "yes"; }; }; }; diff --git a/home-manager/modules/neovim/default.nix b/home-manager/modules/neovim/default.nix index 0876035..df21584 100644 --- a/home-manager/modules/neovim/default.nix +++ b/home-manager/modules/neovim/default.nix @@ -8,7 +8,7 @@ cfg = config.lily.neovim; in { imports = [ - # ./colorscheme.nix + ./colorscheme.nix ./plugins ./keybinds.nix ]; diff --git a/home-manager/modules/waybar/default.nix b/home-manager/modules/waybar/default.nix index c94d579..effe73c 100644 --- a/home-manager/modules/waybar/default.nix +++ b/home-manager/modules/waybar/default.nix @@ -1,18 +1,161 @@ -{ - config, - lib, - ... -}: let +{ pkgs, config, lib, ... }: +let cfg = config.lily.waybar; -in { - options.lily.waybar = { - enable = lib.mkEnableOption "activate waybar"; - }; - +in +{ + options.lily.waybar.enable = lib.mkEnableOption "activate waybar"; config = lib.mkIf cfg.enable { + home.packages = with pkgs; [ + pavucontrol + networkmanagerapplet + blueman + ]; programs.waybar = { enable = true; - systemd.enable = true; + style = ./style.css; + + settings = { + mainBar = { + layer = "top"; + position = "top"; + height = 40; + # tray.icon-size = 15; + + modules-left = [ + "custom/icon" + "custom/separator" + "battery" + "custom/separator" + "custom/screenshot" + "tray" + "hyprland/workspaces" + ]; + + modules-center = [ "hyprland/window" ]; + modules-right = [ + "mpris" + "pulseaudio" + "network" + "clock" + ]; + + mpris = { + format = "{player_icon}{status_icon} [{position}/{length}] {title} - {artist}"; + tooltip-format = "{player_icon}{status_icon} [{position}/{length}] {title} - {artist}"; + title-len = 20; + artist-len = 10; + interval = 1; + player-icons = { + default = ""; + mpv = "🎵 "; + spotify = " "; + }; + status-icons = { + playing = "▶"; + stopped = "󰓛"; + paused = "󰏤"; + }; + on-click-middle = "playerctld shift"; + }; + + battery = { + interval = 30; + states = { + warning = 30; + critical = 15; + }; + format = "{icon} {capacity}%"; + format-charging = " {icon} {capacity}%"; + format-icons = [ " " " " " " " " ]; + max-length = 25; + }; + + pulseaudio = { + format = "{icon} {volume}"; + format-bluetooth = " "; + format-bluetooth-muted = " "; + format-muted = ""; + format-icons = { + default = [ "" "󰕾" "" ]; + }; + on-click = "${pkgs.pavucontrol}/bin/pavucontrol"; + }; + + network = { + format-wifi = "󰖩 {essid}"; + on-click = "${pkgs.networkmanagerapplet}/bin/nm-connection-editor"; + format-ethernet = "󰈀 wired"; + format-disconnected = ""; + tooltip-format = "{ifname} via {gwaddr} "; + tooltip-format-wifi = "{essid} ({signalStrength}%) "; + tooltip-format-ethernet = "{ifname} "; + tooltip-format-disconnected = "Disconnected"; + }; + + clock = { + format = "󰃰 {:%d.%m.%y 󰇙 %H:%M}"; + }; + + "custom/icon" = { + format = " "; + # on-click = "${config.lily.wlogout.logoutlaunch}/bin/logoutlaunch"; + }; + + "custom/screenshot" = { + format = " "; + on-click = "GRIM_DEFAULT_DIR=${config.xdg.configHome}/../Pictures/Screenshots ${pkgs.grim}/bin/grim"; + }; + + "custom/separator" = { + format = " "; + }; + + "hyprland/workspaces" = { + format = "{icon}"; # lavender + tooltip = false; + all-outputs = false; + current-only = true; + sort-by-number = true; + persistent-workspaces = { + "1" = ""; + "2" = ""; + "3" = ""; + "4" = ""; + "5" = ""; + "6" = ""; + "7" = ""; + "8" = ""; + "9" = ""; + "10" = ""; + }; + format-icons = { + "1" = ""; + "2" = ""; + "3" = ""; + "4" = ""; + "5" = ""; + "6" = ""; + "7" = ""; + "8" = ""; + "9" = ""; + "10" = "󰊠"; # sapphire + urgent = ""; # sapphire + active = "󰮯"; # blue + default = ""; + }; + }; + + "hyprland/window" = { + format = "{}"; + rewrite = { + "" = "There is no place like ~"; + }; + max-length = 200; + seperate-outputs = true; + }; + }; + }; }; + # home.file.".config/waybar/themes/theme.css" = { source = ./themes/Catppuccin-Mocha.css; }; }; } diff --git a/home-manager/modules/waybar/default.nix.old b/home-manager/modules/waybar/default.nix.old new file mode 100644 index 0000000..e4bc891 --- /dev/null +++ b/home-manager/modules/waybar/default.nix.old @@ -0,0 +1,203 @@ +{ pkgs, config, lib, ... }: +let + cfg = config.lily.waybar; +in +{ + options.lily.waybar.enable = lib.mkEnableOption "activate waybar"; + config = lib.mkIf cfg.enable { + home.packages = with pkgs; [ + pavucontrol + networkmanagerapplet + blueman + ]; + programs.waybar = { + enable = true; + style = ./style.css; + + settings = { + mainBar = { + layer = "top"; + position = "top"; + mode = "dock"; + height = 40; + tray.icon-size = 15; + + modules-left = [ + "custom/icon" + "custom/separator" + "cpu" + "memory" + "temperature" + "battery" + "custom/separator" + "custom/separator" + "custom/screenshot" + "tray" + "hyprland/workspaces" + ]; + + modules-center = [ "hyprland/window" ]; + modules-right = [ + "mpris" + "pulseaudio" + "network" + "bluetooth" + "custom/wallchange" + "custom/themechange" + "clock" + ]; + + mpris = { + format = "{player_icon}{status_icon} [{position}/{length}] {title} - {artist}"; + tooltip-format = "{player_icon}{status_icon} [{position}/{length}] {title} - {artist}"; + title-len = 20; + artist-len = 10; + interval = 1; + player-icons = { + default = ""; + mpv = "🎵 "; + spotify = " "; + }; + status-icons = { + playing = "▶"; + stopped = "󰓛"; + paused = "󰏤"; + }; + on-click-middle = "playerctld shift"; + }; + + cpu = { + interval = 10; + format = " {usage}"; + max-length = 10; + }; + + memory = { + interval = 30; + format = " {used:0.1f}G"; + max-length = 10; + }; + + temperatures = { + thermal-zone = 0; + critical-threshold = 90; + format-critical = " {temperatureC}°C"; + format = " {temperatureC}°C"; + }; + + battery = { + interval = 30; + states = { + warning = 30; + critical = 15; + }; + format = "{icon} {capacity}%"; + format-charging = " {icon} {capacity}%"; + format-icons = [ " " " " " " " " ]; + max-length = 25; + }; + + pulseaudio = { + format = "{icon} {volume}"; + format-bluetooth = " "; + format-bluetooth-muted = " "; + format-muted = ""; + format-icons = { + default = [ "" "󰕾" "" ]; + }; + on-click = "${pkgs.pavucontrol}/bin/pavucontrol"; + }; + + network = { + format-wifi = "󰖩 {essid}"; + on-click = "${pkgs.networkmanagerapplet}/bin/nm-connection-editor"; + format-ethernet = "󰈀 wired"; + format-disconnected = ""; + tooltip-format = "{ifname} via {gwaddr} "; + tooltip-format-wifi = "{essid} ({signalStrength}%) "; + tooltip-format-ethernet = "{ifname} "; + tooltip-format-disconnected = "Disconnected"; + }; + + bluetooth = { + tooltip = true; + on-click = "${pkgs.blueman}/bin/blueman-manager"; + }; + + clock = { + format = "󰃰 {:%d.%m.%y 󰇙 %H:%M}"; + }; + + "custom/icon" = { + format = " "; + # on-click = "${config.lily.wlogout.logoutlaunch}/bin/logoutlaunch"; + }; + + "custom/screenshot" = { + format = " "; + on-click = "GRIM_DEFAULT_DIR=${config.xdg.configHome}/../Pictures/Screenshots ${pkgs.grim}/bin/grim"; + }; + + "custom/separator" = { + format = " "; + }; + + # "custom/wallchange" = { + # format = "󰉼 {}"; + # tooltip = true; + # exec = "echo ; echo 󰆊 switch wallpaper"; + # on-click = "${inputs.wall-utils.packages.${pkgs.system}.wall-utils}/bin/wall-utils next"; + # on-click-right = "${inputs.wall-utils.packages.${pkgs.system}.wall-utils}/bin/wall-utils previous"; + # on-click-middle = "${inputs.wall-utils.packages.${pkgs.system}.wall-utils}/bin/wall-utils select"; + # # interval = 3600; # once every day + # }; + + "hyprland/workspaces" = { + format = "{icon}"; # lavender + tooltip = false; + all-outputs = false; + current-only = true; + sort-by-number = true; + persistent-workspaces = { + "1" = ""; + "2" = ""; + "3" = ""; + "4" = ""; + "5" = ""; + "6" = ""; + "7" = ""; + "8" = ""; + "9" = ""; + "10" = ""; + }; + format-icons = { + "1" = ""; + "2" = ""; + "3" = ""; + "4" = ""; + "5" = ""; + "6" = ""; + "7" = ""; + "8" = ""; + "9" = ""; + "10" = "󰊠"; # sapphire + urgent = ""; # sapphire + active = "󰮯"; # blue + default = ""; + }; + }; + + "hyprland/window" = { + format = "{}"; + rewrite = { + "" = "There is no place like ~"; + }; + max-length = 200; + seperate-outputs = true; + }; + }; + }; + }; + home.file.".config/waybar/themes/theme.css" = { source = ./themes/Catppuccin-Mocha.css; }; + }; +} diff --git a/home-manager/modules/waybar/style.css b/home-manager/modules/waybar/style.css new file mode 100644 index 0000000..8e34242 --- /dev/null +++ b/home-manager/modules/waybar/style.css @@ -0,0 +1,108 @@ +* { + /* `otf-font-awesome` and SpaceMono Nerd Font are required to be installed for icons */ + font-family: "Fira Sans Semibold", FontAwesome, Roboto, Helvetica, Arial, sans-serif; + font-size: 15px; + transition: background-color .3s ease-out; +} + +window#waybar { + background: rgba(26, 27, 38, 0); + border: none; + color: #c0caf5; + font-family: + SpaceMono Nerd Font, + feather; + transition: background-color .5s; +} + +.modules-left, +.modules-center, +.modules-right +{ + background: rgba(0, 0, 8, 1); + margin: 5px 10px; + padding: 0 5px; + border-radius: 15px; +} +.modules-left { + padding: 0; +} +.modules-center { + padding: 0 10px; +} + +#clock, +#battery, +#cpu, +#memory, +#disk, +#temperature, +#backlight, +#network, +#pulseaudio, +#wireplumber, +#custom-media, +#tray, +#mode, +#idle_inhibitor, +#scratchpad, +#power-profiles-daemon, +#language, +#mpd { + padding: 0 10px; + border-radius: 15px; +} + +#clock:hover, +#battery:hover, +#cpu:hover, +#memory:hover, +#disk:hover, +#temperature:hover, +#backlight:hover, +#network:hover, +#pulseaudio:hover, +#wireplumber:hover, +#custom-media:hover, +#tray:hover, +#mode:hover, +#idle_inhibitor:hover, +#scratchpad:hover, +#power-profiles-daemon:hover, +#language:hover, +#mpd:hover { + background: rgba(26, 27, 38, 0.9); +} + + +#workspaces button { + background: transparent; + font-family: + SpaceMono Nerd Font, + feather; + font-weight: 900; + font-size: 13pt; + color: #c0caf5; + border:none; + border-radius: 15px; +} + +#workspaces button.active { + background: #13131d; +} + +#workspaces button:hover { + background: #11111b; + color: #cdd6f4; + box-shadow: none; +} + +#custom-arch { + margin-left: 5px; + padding: 0 10px; + font-size: 25px; + transition: color .5s; +} +#custom-arch:hover { + color: #1793d1; +} diff --git a/home-manager/modules/waybar/style.css.old b/home-manager/modules/waybar/style.css.old new file mode 100644 index 0000000..3df4eeb --- /dev/null +++ b/home-manager/modules/waybar/style.css.old @@ -0,0 +1,153 @@ +* { + border: none; + border-radius: 0px; + font-family: "Iosevka Nerd Font"; + font-weight: bold; + font-size: 13px; + min-height: 10px; +} + +@import "themes/theme.css"; + +window#waybar { + border-bottom: 1px solid rgba(255,255, 255, 0.2); + border-left: 1px solid rgba(255, 255, 255, 0.2); + border-right: 1px solid rgba(255, 255, 255, 0.2); + border-bottom-right-radius: 10px; + border-bottom-left-radius: 10px; + background: @bar-bg; +} + +tooltip { + background: @main-bg; + color: @main-fg; + border-radius: 7px; + border-width: 0px; +} + +#cpu, +#battery, +#memory, +#temperature { + padding-left: 10px; + padding-right: 10px; + background-color: @wb-act-fg; + margin: 1px 0px 1px 0px; +} + +#cpu { + border-radius: 10px 0px 0px 10px; + color: @maroon; +} + +#memory { + color: @peach; +} + +#temperature { + color: @yellow; +} + +#memory, +#temperature { + border-radius: 0px; +} + +#battery { + border-radius: 0px 10px 10px 0px; + color: @green; +} + +#tray { + color: @sky; +} + +#pulseaudio { + color: @rosewater; +} + +#mpris { + color: @rosewater; +} + +#network { + color: @flamingo; +} + +#bluetooth { + color: @pink; +} + +#custom-wallchange, +#custom-themechange { + color: @mauve; +} + +#clock { + color: @mauve; +} + +#bluetooth, +#clock, +#idle_inhibitor, +#language, +#mpris, +#network, +#pulseaudio, +#taskbar, +#tray, +#window, +#custom-icon, +#workspaces { + opacity: 1; + padding-left: 10px; + padding-right: 10px; + border-radius: 10px; +} + +.modules-left, +.modules-right, +.modules-center { + color: @main-fg; + background: @main-bg; + border-radius: 10px; + margin-left: 2px; + margin-right: 2px; + margin-top: 2px; + margin-bottom: 2px; +} + +#custom-icon { + color: @red; + font-weight: bold; +} + +#custom-apt-update-icon, +#custom-screenshot +{ + color: @teal; +} + +#workspaces { + color: @main-fg; + background: @main-bg; +} + +#workspaces button { + padding-left: 3px; + padding-right: 3px; + border-radius: 10px; + color: @main-fg; + transition: all 0.5s cubic-bezier(0.55, -0.68, 0.48, 1.682); +} + +#workspaces button.active { + background: @wb-act-fg; + color: @lavender; + margin-left: 3px; + padding-left: 12px; + margin-top: 2px; + margin-bottom: 2px; + padding-right: 12px; + margin-right: 3px; +} diff --git a/home-manager/modules/waybar/themes/Catppuccin-Latte.css b/home-manager/modules/waybar/themes/Catppuccin-Latte.css new file mode 100644 index 0000000..6e146db --- /dev/null +++ b/home-manager/modules/waybar/themes/Catppuccin-Latte.css @@ -0,0 +1,26 @@ +@define-color bar-bg rgba(0, 0, 0, 0); + + +@define-color main-bg #dce0e8; +@define-color main-fg #4c4f69; + +@define-color wb-act-bg #ccd0da; +@define-color wb-act-fg #bcc0cc; + +@define-color wb-hvr-bg #acb0be; +@define-color wb-hvr-fg #6cd0da; + +@define-color rosewater #dc8a78; +@define-color flamingo #dd7878; +@define-color pink #ea76cb; +@define-color mauve #8839ef; +@define-color red #d20f39; +@define-color maroon #e64553; +@define-color peach #fe640b; +@define-color yellow #df8e1d; +@define-color green #40a02b; +@define-color teal #179299; +@define-color sky #04a5e5; +@define-color sapphire #209fb5; +@define-color blue #1e66f5; +@define-color lavender #7287fd; diff --git a/home-manager/modules/waybar/themes/Catppuccin-Mocha.css b/home-manager/modules/waybar/themes/Catppuccin-Mocha.css new file mode 100644 index 0000000..078d8af --- /dev/null +++ b/home-manager/modules/waybar/themes/Catppuccin-Mocha.css @@ -0,0 +1,25 @@ +@define-color bar-bg rgba(0, 0, 0, 0); + +@define-color main-bg #11111b; +@define-color main-fg #cdd6f4; + +@define-color wb-act-bg #a6adc8; +@define-color wb-act-fg #313244; + +@define-color wb-hvr-bg #f5c2e7; +@define-color wb-hvr-fg #313244; + +@define-color rosewater #f5e0dc; +@define-color flamingo #f2cdcd; +@define-color pink #f5c2e7; +@define-color mauve #cba6f7; +@define-color red #f38ba8; +@define-color maroon #eba0ac; +@define-color peach #fab387; +@define-color yellow #f9e2af; +@define-color green #a6e3a1; +@define-color teal #94e2d5; +@define-color sky #89dceb; +@define-color sapphire #74c7ec; +@define-color blue #89b4fa; +@define-color lavender #b4befe; diff --git a/home-manager/modules/waybar/themes/theme.css b/home-manager/modules/waybar/themes/theme.css new file mode 100644 index 0000000..56f46af --- /dev/null +++ b/home-manager/modules/waybar/themes/theme.css @@ -0,0 +1,26 @@ +@define-color bar-bg rgba(0, 0, 0, 0); + + +@define-color main-bg #11111b; +@define-color main-fg #cdd6f4; + +@define-color wb-act-bg #a6adc8; +@define-color wb-act-fg #313244; + +@define-color wb-hvr-bg #f5c2e7; +@define-color wb-hvr-fg #313244; + +@define-color rosewater #f5e0dc; +@define-color flamingo #f2cdcd; +@define-color pink #f5c2e7; +@define-color mauve #cba6f7; +@define-color red #f38ba8; +@define-color maroon #eba0ac; +@define-color peach #fab387; +@define-color yellow #f9e2af; +@define-color green #a6e3a1; +@define-color teal #94e2d5; +@define-color sky #89dceb; +@define-color sapphire #74c7ec; +@define-color blue #89b4fa; +@define-color lavender #b4befe; diff --git a/home-manager/profiles/desktop.nix b/home-manager/profiles/desktop.nix index 3755a57..fb7aaaa 100644 --- a/home-manager/profiles/desktop.nix +++ b/home-manager/profiles/desktop.nix @@ -17,5 +17,11 @@ vesktop inputs.zen-browser.packages."${system}".default hyfetch + + nerd-fonts.iosevka + nerd-fonts.space-mono + fira-sans + + prismlauncher ]; } diff --git a/modules/common/desktop.nix b/modules/common/desktop.nix index 8d83f6d..bc5adc4 100644 --- a/modules/common/desktop.nix +++ b/modules/common/desktop.nix @@ -2,6 +2,7 @@ pkgs, lib, config, + inputs, flake-self, ... }: let @@ -29,6 +30,7 @@ in { envsubst glib headsetcontrol + flatpak ]; networking = { networkmanager.enable = true; @@ -68,7 +70,7 @@ in { }; # services.printing.enable = true; - # services.flatpak.enable = true; + services.flatpak.enable = true; services.avahi = { enable = true; nssmdns4 = true; @@ -78,5 +80,11 @@ in { # environment.sessionVariables = { # MOZ_DISABLE_RDD_SANDBOX = "1"; # }; + + programs.nix-ld.enable = true; + programs.nix-ld.libraries = with pkgs; [ + # Add any missing dynamic libraries for unpackaged programs + # here, NOT in environment.systemPackages + ]; }; } diff --git a/modules/wayland/default.nix b/modules/wayland/default.nix index c896cc9..68ed01a 100644 --- a/modules/wayland/default.nix +++ b/modules/wayland/default.nix @@ -13,7 +13,7 @@ in { [ wl-clipboard xwayland - xwaylandvideobridge + kdePackages.xwaylandvideobridge wayland-utils wev ] From 01ff69d49900e6212d92419da90683ad5578d4da Mon Sep 17 00:00:00 2001 From: lily Date: Sat, 5 Apr 2025 22:02:41 -0400 Subject: [PATCH 100/102] add: vscode config --- home-manager/modules/vscode/default.nix | 19 ++++++------------- home-manager/profiles/desktop.nix | 7 +++++++ 2 files changed, 13 insertions(+), 13 deletions(-) diff --git a/home-manager/modules/vscode/default.nix b/home-manager/modules/vscode/default.nix index 2c02cc2..637061e 100644 --- a/home-manager/modules/vscode/default.nix +++ b/home-manager/modules/vscode/default.nix @@ -15,7 +15,7 @@ in { enable = true; enableUpdateCheck = false; enableExtensionUpdateCheck = false; - mutableExtensionsDir = false; + mutableExtensionsDir = true; package = pkgs.vscode.overrideAttrs (attrs: { buildInputs = with pkgs; attrs.buildInputs @@ -27,6 +27,7 @@ in { ]; }); extensions = with pkgs.vscode-extensions; [ + github.github-vscode-theme github.copilot github.copilot-chat rust-lang.rust-analyzer @@ -42,8 +43,6 @@ in { bierner.markdown-footnotes bierner.markdown-mermaid denoland.vscode-deno - ziglang.vscode-zig - # geequlim.godot-tools gruntfuggly.todo-tree mhutchie.git-graph fill-labs.dependi @@ -52,21 +51,14 @@ in { twxs.cmake llvm-vs-code-extensions.vscode-clangd mkhl.direnv - (pkgs.vscode-utils.buildVscodeMarketplaceExtension { - mktplcRef = { - name = "darcula-solid"; - publisher = "jussiemion"; - version = "1.2.1"; - hash = "sha256-tIfCkOR1Z/uRWiZhrBfOQCZT3Cu6yNjAnxjn0UJFO2U="; - }; - }) + vscodevim.vim ]; userSettings = { "editor.cursorSmoothCaretAnimation" = "on"; "editor.smoothScrolling" = true; "editor.cursorBlinking" = "expand"; - "workbench.colorTheme" = "Darcula Solid"; + "workbench.colorTheme" = "GitHub Dark Default"; "clangd.path" = "${pkgs.clang-tools}/bin/clangd"; "clangd.arguments" = [ "--clang-tidy" @@ -77,7 +69,8 @@ in { "--all-scopes-completion" ]; "editor.fontFamily" = "JetBrainsMono Nerd Font"; - "zig.path" = "${pkgs.zls}/bin/zls"; + "workbench.activityBar.location" = "top"; + "window.menuBarVisibility" = "compact"; }; }; }; diff --git a/home-manager/profiles/desktop.nix b/home-manager/profiles/desktop.nix index fb7aaaa..028b65c 100644 --- a/home-manager/profiles/desktop.nix +++ b/home-manager/profiles/desktop.nix @@ -12,6 +12,7 @@ neovim.enable = true; rofi.enable = true; waybar.enable = true; + vscode.enable = true; }; home.packages = with pkgs; [ vesktop @@ -23,5 +24,11 @@ fira-sans prismlauncher + element-desktop + mission-center + + appimage-run + + r2modman ]; } From a2fe2d8afd27b6acdddc4d697ea3a4429cef776f Mon Sep 17 00:00:00 2001 From: lily Date: Sat, 5 Apr 2025 22:36:02 -0400 Subject: [PATCH 101/102] fix: broken xdg-desktop-portals --- home-manager/profiles/desktop.nix | 7 +++++++ modules/plasma/default.nix | 5 +++++ 2 files changed, 12 insertions(+) diff --git a/home-manager/profiles/desktop.nix b/home-manager/profiles/desktop.nix index 028b65c..767b539 100644 --- a/home-manager/profiles/desktop.nix +++ b/home-manager/profiles/desktop.nix @@ -31,4 +31,11 @@ r2modman ]; + + xdg.portal.enable = true; + xdg.portal.extraPortals = with pkgs; [ + kdePackages.xdg-desktop-portal-kde + xdg-desktop-portal-gtk + xdg-desktop-portal-hyprland + ]; } diff --git a/modules/plasma/default.nix b/modules/plasma/default.nix index 2939da2..aa51cb1 100644 --- a/modules/plasma/default.nix +++ b/modules/plasma/default.nix @@ -16,5 +16,10 @@ in { }; desktopManager.plasma6.enable = true; }; + + xdg.portal.enable = true; + xdg.portal.extraPortals = [ + pkgs.kdePackages.xdg-desktop-portal-kde + ]; }; } From 9daf8433e6eed36825829a1cea8dd6e2dd658557 Mon Sep 17 00:00:00 2001 From: lily Date: Mon, 7 Apr 2025 13:18:51 -0400 Subject: [PATCH 102/102] add(nixvim): neocord --- home-manager/modules/neovim/plugins/default.nix | 1 + home-manager/modules/neovim/plugins/neocord.nix | 6 ++++++ home-manager/profiles/desktop.nix | 5 +++++ 3 files changed, 12 insertions(+) create mode 100644 home-manager/modules/neovim/plugins/neocord.nix diff --git a/home-manager/modules/neovim/plugins/default.nix b/home-manager/modules/neovim/plugins/default.nix index 8031650..0383ae1 100644 --- a/home-manager/modules/neovim/plugins/default.nix +++ b/home-manager/modules/neovim/plugins/default.nix @@ -6,6 +6,7 @@ ./gitsigns.nix ./tree.nix ./lsp + ./neocord.nix # ./dap.nix ]; programs.nixvim.plugins = { diff --git a/home-manager/modules/neovim/plugins/neocord.nix b/home-manager/modules/neovim/plugins/neocord.nix new file mode 100644 index 0000000..71e42a4 --- /dev/null +++ b/home-manager/modules/neovim/plugins/neocord.nix @@ -0,0 +1,6 @@ +{...}: { + programs.nixvim.plugins.neocord.enable = true; + programs.nixvim.plugins.neocord.settings = { + show_line_number = true; + }; +} diff --git a/home-manager/profiles/desktop.nix b/home-manager/profiles/desktop.nix index 767b539..f988f56 100644 --- a/home-manager/profiles/desktop.nix +++ b/home-manager/profiles/desktop.nix @@ -38,4 +38,9 @@ xdg-desktop-portal-gtk xdg-desktop-portal-hyprland ]; + + home.sessionVariables = { + XCURSOR_THEME = "Breeze"; + XCURSOR_SIZE = "24"; + }; }