>~ are noweb placeholders that are expanded from other blocks during tangling.
-
-** Nix & NixOS
-
-* [[[https://nix.dev/][Nix](https://nix.dev/][Nix)]] is used to define packages, environments, and configuration as pure expressions.
-* [[[https://nixos.org/][NixOS](https://nixos.org/][NixOS)]] evaluates Nix expressions into a complete system configuration that can be applied by rebuild operations.
-
-** Repository layout and folder conventions
- #+HTML:
- #+HTML: This repository contains system modules, user modules, and configuration fragments. The following directories are treated as separate layers:
- #+HTML: ./configuration (NixOS modules), ./home (Home Manager modules), and ./assets/conf (configuration fragments referenced or deployed by the modules).
- #+HTML:
- #+HTML:
- #+HTML: To keep navigation consistent, the same internal substructure is used in all three locations. Each layer keeps its role; only the internal grouping is standardized.
- #+HTML:
-
-** Shared domain folders
-#+HTML:
-#+HTML: core/ – base settings and common infrastructuredesktop/ – graphical session, compositor, UI components, and integrationapps/ – application enablement and application-level configurationservices/ – background services and daemonssecurity/ – secrets handling and security-related configurationdev/ – developer tooling and editor configuration
-
-** Full tree (including unchanged parts)
-#+HTML:
-#+HTML: The tree below shows the full repository layout, with the standardized internal structure applied only inside
-#+HTML: configuration/, home/, and assets/conf/.
-#+HTML:
-
-#+HTML: .
-#+HTML: ├── flake.nix
-#+HTML: ├── flake.lock
-#+HTML: ├── README.org
-#+HTML: ├── user.nix
-#+HTML: ├── assets
-#+HTML: │ ├── background.png
-#+HTML: │ ├── conf
-#+HTML: │ │ ├── apps
-#+HTML: │ │ │ ├── flatpak.conf
-#+HTML: │ │ │ └── packages.conf
-#+HTML: │ │ ├── core
-#+HTML: │ │ │ └── xdg
-#+HTML: │ │ │ └── mimeapps.list
-#+HTML: │ │ ├── desktop
-#+HTML: │ │ │ ├── greeter
-#+HTML: │ │ │ │ └── greeter.conf
-#+HTML: │ │ │ ├── hypr
-#+HTML: │ │ │ │ ├── bindings.conf
-#+HTML: │ │ │ │ ├── hyprland.conf
-#+HTML: │ │ │ │ ├── hyprland_no_blur.conf
-#+HTML: │ │ │ │ └── hyprshell.conf
-#+HTML: │ │ │ ├── terminal
-#+HTML: │ │ │ │ (optional: desktop-facing terminal fragments if needed)
-#+HTML: │ │ │ ├── wallpaper
-#+HTML: │ │ │ │ └── wallpaper.conf
-#+HTML: │ │ │ └── waybar
-#+HTML: │ │ │ ├── config.jsonc
-#+HTML: │ │ │ └── style.css
-#+HTML: │ │ ├── dev
-#+HTML: │ │ │ ├── hyprshell
-#+HTML: │ │ │ │ ├── config.ron.bak
-#+HTML: │ │ │ │ └── styles.css.bak
-#+HTML: │ │ │ └── terminal
-#+HTML: │ │ │ ├── aliases.conf
-#+HTML: │ │ │ ├── kitty.conf
-#+HTML: │ │ │ ├── starship.toml
-#+HTML: │ │ │ └── zsh.conf
-#+HTML: │ │ ├── security
-#+HTML: │ │ │ └── ssh
-#+HTML: │ │ │ └── ssh-client.conf
-#+HTML: │ │ └── services
-#+HTML: │ ├── lock.png
-#+HTML: │ ├── scripts
-#+HTML: │ └── wallpaper
-#+HTML: │ ├── gif
-#+HTML: │ ├── picture
-#+HTML: │ │ ├── pexels-kseniachernaya-5691695.jpg
-#+HTML: │ │ ├── pexels-lalesh-147635.jpg
-#+HTML: │ │ ├── pexels-lucaspezeta-2212858.jpg
-#+HTML: │ │ ├── pexels-themob000-28428584.jpg
-#+HTML: │ │ └── pexels-themob000-28428592.jpg
-#+HTML: │ └── videos
-#+HTML: │ ├── dark_water_large.mp4
-#+HTML: │ └── white_blobs_small.mp4
-#+HTML: ├── configuration
-#+HTML: │ ├── default.nix
-#+HTML: │ ├── apps
-#+HTML: │ │ ├── flatpak.nix
-#+HTML: │ │ └── packages.nix
-#+HTML: │ ├── core
-#+HTML: │ │ ├── cli.nix
-#+HTML: │ │ ├── files.nix
-#+HTML: │ │ ├── locale.nix
-#+HTML: │ │ ├── networking.nix
-#+HTML: │ │ └── nix-settings.nix
-#+HTML: │ ├── desktop
-#+HTML: │ │ ├── audio.nix
-#+HTML: │ │ ├── hyprland.nix
-#+HTML: │ │ └── login.nix
-#+HTML: │ ├── dev
-#+HTML: │ │ └── boot.nix
-#+HTML: │ ├── security
-#+HTML: │ │ └── sops.nix
-#+HTML: │ └── services
-#+HTML: │ └── services.nix
-#+HTML: ├── hardware
-#+HTML: │ └── hardware.nix
-#+HTML: ├── home
-#+HTML: │ ├── default.nix
-#+HTML: │ ├── apps
-#+HTML: │ │ └── theme.nix
-#+HTML: │ ├── core
-#+HTML: │ │ └── unity.nix
-#+HTML: │ ├── desktop
-#+HTML: │ │ ├── hyprland.nix
-#+HTML: │ │ ├── lock.nix
-#+HTML: │ │ ├── walker.nix
-#+HTML: │ │ ├── wallpaper.nix
-#+HTML: │ │ └── waybar.nix
-#+HTML: │ ├── dev
-#+HTML: │ │ ├── dev.nix
-#+HTML: │ │ ├── terminal.nix
-#+HTML: │ │ └── emacs
-#+HTML: │ │ ├── default.nix
-#+HTML: │ │ ├── early-init.el
-#+HTML: │ │ └── init.el
-#+HTML: │ ├── security
-#+HTML: │ ├── services
-#+HTML: │ └── theme
-#+HTML: │ └── theme.nix
-#+HTML: ├── LICENSE
-#+HTML: ├── machines
-#+HTML: │ └── traveldroid
-#+HTML: │ ├── configuration.nix
-#+HTML: │ ├── hardware-configuration.nix
-#+HTML: │ └── home.nix
-#+HTML: ├── main
-#+HTML: └── secrets
-#+HTML: └── secrets.yaml
-#+HTML:
-
-** Notes
-#+HTML:
-#+HTML: - Only the internal layout of
configuration/, home/, and assets/conf/ is standardized; all other paths remain as currently organized.
-#+HTML: - The
services/ and security/ folders are included for completeness even if initially empty in some layers.
-#+HTML:
-
- ~YourNixCode(Input) -> System Configuration~
-
-├── flake.lock
-├── flake.nix
-├── README.org
-├── user.nix
-├── assets
-│ ├── background.png
-│ ├── conf
-│ │ ├── apps
-│ │ │ ├── flatpak.conf
-│ │ │ └── packages.conf
-│ │ ├── core
-│ │ │ └── xdg
-│ │ │ └── mimeapps.list
-│ │ ├── desktop
-│ │ │ ├── greeter
-│ │ │ │ └── greeter.conf
-│ │ │ ├── hypr
-│ │ │ │ ├── bindings.conf
-│ │ │ │ ├── hyprland.conf
-│ │ │ │ ├── hyprland_no_blur.conf
-│ │ │ │ └── hyprshell.conf
-│ │ │ ├── terminal
-│ │ │ │ (optional: desktop-facing terminal fragments if needed)
-│ │ │ ├── wallpaper
-│ │ │ │ └── wallpaper.conf
-│ │ │ └── waybar
-│ │ │ ├── config.jsonc
-│ │ │ └── style.css
-│ │ ├── dev
-│ │ │ ├── hyprshell
-│ │ │ │ ├── config.ron.bak
-│ │ │ │ └── styles.css.bak
-│ │ │ └── terminal
-│ │ │ ├── aliases.conf
-│ │ │ ├── kitty.conf
-│ │ │ ├── starship.toml
-│ │ │ └── zsh.conf
-│ │ ├── security
-│ │ │ └── ssh
-│ │ │ └── ssh-client.conf
-│ │ └── services
-│ ├── lock.png
-│ ├── scripts
-│ └── wallpaper
-│ ├── gif
-│ ├── picture
-│ │ ├── pexels-kseniachernaya-5691695.jpg
-│ │ ├── pexels-lalesh-147635.jpg
-│ │ ├── pexels-lucaspezeta-2212858.jpg
-│ │ ├── pexels-themob000-28428584.jpg
-│ │ └── pexels-themob000-28428592.jpg
-│ └── videos
-│ ├── dark_water_large.mp4
-│ └── white_blobs_small.mp4
-├── configuration
-│ ├── default.nix
-│ ├── apps
-│ │ ├── flatpak.nix
-│ │ └── packages.nix
-│ ├── core
-│ │ ├── cli.nix
-│ │ ├── files.nix
-│ │ ├── locale.nix
-│ │ ├── networking.nix
-│ │ └── nix-settings.nix
-│ ├── desktop
-│ │ ├── audio.nix
-│ │ ├── hyprland.nix
-│ │ └── login.nix
-│ ├── dev
-│ │ └── boot.nix
-│ ├── security
-│ │ └── sops.nix
-│ └── services
-│ └── services.nix
-├── hardware
-│ └── hardware.nix
-├── home
-│ ├── default.nix
-│ ├── apps
-│ │ └── theme.nix
-│ ├── core
-│ │ └── unity.nix
-│ ├── desktop
-│ │ ├── hyprland.nix
-│ │ ├── lock.nix
-│ │ ├── walker.nix
-│ │ ├── wallpaper.nix
-│ │ └── waybar.nix
-│ ├── dev
-│ │ ├── dev.nix
-│ │ ├── terminal.nix
-│ │ └── emacs
-│ │ ├── default.nix
-│ │ ├── early-init.el
-│ │ └── init.el
-│ ├── security
-│ ├── services
-│ └── theme
-│ └── theme.nix
-├── LICENSE
-├── machines
-│ └── traveldroid
-│ ├── configuration.nix
-│ ├── hardware-configuration.nix
-│ └── home.nix
-├── main
-├── README.org
-└── secrets
- └── secrets.yaml
-
-
- I use [[https://nixos.wiki/wiki/Flakes][nix flakes]] which means that the entry point for the nix evaluation is a file called ~flake.nix~ which has two parts (among other things)
-
- #+begin_src nix
- {
- inputs: # describes the function input, consisting mainly of package sources
- outputs: # what the function outputs, a nixos configuration in our case
- }
- #+end_src
-
- Nix flakes is still behind an ~experimental~ flag, but it is de facto the standard by most of the community.
- Flakes allow us to pin the input package versions using a ~flake.lock~ file.
- This prevents unwanted and surprise updates when rebuilding without changing the configuration.
-
-* TLDR App List
-
-| Window Manager | [[https://hyprland.org/][Hyprland]] |
-| Bar | [[https://github.com/Alexays/Waybar][Waybar]] |
-| Application Launcher | [[https://github.com/abenz1267/walker][Walker]] |
-| Notification Daemon | [[https://github.com/dunst-project/dunst][Dunst]] |
-| Terminal Emulator | [[https://alacritty.org/][Alacritty]] |
-| Shell | [[https://ohmyz.sh/][Zsh]] and [[https://starship.rs/][Starship]] |
-| Text Editor | [[https://www.gnu.org/software/emacs/][Emacs]] |
-| File Manager | [[https://docs.xfce.org/xfce/thunar/start][Thunar]] |
-| Fonts | [[https://protesilaos.com/codelog/2025-02-12-aporetic-fonts-version-1-1-0/][Aporeti]] |
-| Colors | [[https://catppuccin.com/][Catppuccin]] |
-| Icons | [[https://nix.catppuccin.com/][Catppuccin Nix ]] |
-| Lock Screen | [[https://wiki.hyprland.org/Hypr-Ecosystem/hyprlock/][Hyprlock]] |
-| Wallpapers | [[https://github.com/hyprwm/hyprpaper][Hyprpaper]] |
-
-* Configuration Variables
-I have a bunch of constant strings that I would rather put in a file. Thats what ~user.nix~ is.
-The values are imported at the beginning and are available to almost all the functions being called to configure the system.
-#+begin_src nix :tangle user.nix
- {
- system = "x86_64-linux";
- username = "henrov";
- stateVersion = "25.11";
- locale = "sv_SE.UTF-8";
- }
-#+end_src
-
-* Flake Inputs
-The inputs for my system's configuration are very simple
-1. [[https://search.nixos.org/packages][nixpkgs]] - the main nix repository of packages. Its huge and growing. Pinned to the unstable release channel.
- Sometimes pinned to a specific commit because unstable broke something and the fix hasn't made it into the release yet.
-2. [[https://nix-community.github.io/home-manager/][home-manager]] - a nix module that helps keep track of user specific dotfiles and configurations as part of my nix config.
-3. [[https://github.com/nix-community/emacs-overlay][emacs-overlay]] - this has more configuration options and generally a newer emacs available provided by the community.
-# 4. [[https://github.com/getsops/sops][sops-nix]] - adds latest sops for secrets management.
-5. [[https://nix.catppuccin.com/][catppuccin]] - nix module that allows everything to be catppuccin themed.
-
-#+begin_src nix :tangle flake.nix :noweb tangle
- {
- description = "Henrov's nixos configuration";
-
- inputs = {
- nixpkgs.url = "github:nixos/nixpkgs/nixos-unstable";
-
- home-manager = {
- url = "github:nix-community/home-manager";
- inputs.nixpkgs.follows = "nixpkgs";
- };
-
- emacs-overlay = {
- url = "github:nix-community/emacs-overlay";
- inputs.nixpkgs.follows = "nixpkgs";
- };
-
-# sops-nix = {
-# url = "github:Mic92/sops-nix";
-# inputs.nixpkgs.follows = "nixpkgs";
-# };
-#
- catppuccin = {
- url = "github:catppuccin/nix";
- inputs.nixpkgs.follows = "nixpkgs";
- };
- };
-
- <>
- }
-#+end_src
-
-* Flake Output
-#+HTML: ├── flake.nix
-#+HTML: ├── user.nix
-Now that the inputs are ready, the outputs define what the system will actually look like. I also define the machines that this configuration specifies early on. Finally, I iterate over the ~machines~ list and pull files from ~/.machines/${name}~ subdirectory. This allows me to have configuration that has machine specific configuration limited to those files while also keeping a modular reusable base.
-We also add a devshell that makes editing this repository easier in emacs.
-
-#+name: flake-outputs
-#+begin_src nix :noweb no-export
- outputs = {
- nixpkgs,
- home-manager,
- emacs-overlay,
- # sops-nix,
- catppuccin,
- ...
- }:
- let
- user = import ./user.nix;
- lib = nixpkgs.lib;
- machines = [
- "traveldroid"
- ];
- pkgs = import nixpkgs {
- inherit (user) system;
- };
- in
- {
- nixosConfigurations = builtins.listToAttrs (
- builtins.map (machine: {
- name = machine;
- value = lib.nixosSystem {
- modules = [
- <>
- <>
- <>
- #sops-nix.nixosModules.sops # sops
- catppuccin.nixosModules.catppuccin # theme
- ];
- specialArgs = {
- hostname = machine;
- inherit user;
- };
- };
- }) machines
- );
- devShells.${user.system}.default = pkgs.mkShell {
- buildInputs = with pkgs; [
- nil # nix lsp server
- nixfmt-rfc-style # nix formatter
- #sops # used to edit secrets
- ];
- };
- };
-#+end_src
-
-Lets look at the individual modules
-1. Emacs
- The first is the emacs overlay so that it uses the nix-community emacs overlay from the inputs instead of the nixpkgs one.
- Overlays are a special nix way to override existing packages within a repository.
-
- #+name: flake-emacs-module
- #+begin_src nix
- ({ ... }: {
- nixpkgs.overlays = [ emacs-overlay.overlays.default ];
- })
- #+end_src
-
-2. Then the machine specific configuration, in this case, just "traveldroid".
- #+name: flake-config-module
- #+begin_src nix
- ./machines/${machine}/configuration.nix
- #+end_src
-
-3. And finally the home-manager module.
- This can be initialized and managed on its own but I'd rather use the ~nixos-rebuild~ command to build everything instead of managing userland dotfiles separately.
-
- #+name: flake-home-module
- #+begin_src nix :noweb no-export
- home-manager.nixosModules.home-manager
- {
- home-manager.useGlobalPkgs = true;
- home-manager.useUserPackages = true;
- home-manager.extraSpecialArgs = {
- inherit user;
- };
- <>
- <>
- }
- #+end_src
-
- - Home-Manager will not overwrite existing configuration files and that is good in most cases, but when everything is declarative like it is here, I'd rather that home-manager create a ~.backup~ and replace the file.
- #+name: flake-home-backup
- #+begin_src nix
- home-manager.backupFileExtension = "backup";
- #+end_src
-
- - Finally I pull in the machine specific home configuration. Along with the overrides from catppuccin.
- #+name: flake-home-config
- #+begin_src nix
- home-manager.users.${user.username} = {
- imports = [
- ./machines/${machine}/home.nix
- catppuccin.homeModules.catppuccin
- ];
- };
- #+end_src
-
-** Envrc + Direnv
-Editing this file will be much nicer if we have the dev environment configured.
-That is done in the devshells section. But to auto load this dev shell, we need a .envrc file.
-This tells [[https://direnv.net/][direnv]] to load the devshell in the flake.
-#Finally, we also look for a .envrc-private file and try to load that. That contains devshell specific secrets.
-
-#+begin_src nix :tangle .envrc
- use flake
-
- watch_file .envrc.private
- if [[ -f .envrc.private ]]; then
- source_env .envrc.private
- fi
-#+end_src
-
-#+HTML: ├── machines
-#+HTML: │ └── traveldroid
-#+HTML: │ ├── configuration.nix
-#+HTML: │ ├── hardware-configuration.nix
-#+HTML: │ └── home.nix
-* Machines
-The individual machines subdirectory is configured as follows :-
-#+name: tree
-#+begin_src ditaa
- +--machine
- | +--configuration.nix
- | +--home.nix
- | +--hardware-configuration.nix
-#+end_src
-
-- configuration.nix has the system configuration.
-- home.nix has the user level configuration.
-- hardware-configuration.nix has the unique hardware configuration.
-
-~nixos-rebuild switch --flake .#traveldroid~ looks for the traveldroid configuration (in ~/machines/traveldroid~) and returns the configuration that is specific to that computer.
-
-- Note about imports
- ~imports = []~ in a nix file will pull in the function/object from the list of files provided.
- This imported object (or function result) is just trivially merged into a common object.
-
-We can take a look at that the common hardware options I have for all my machines.
-*** Other Utils
-**** Updates
-To update the computer, I just need to update the ~flake.lock~ file to have references to the latest repository. This is done with :-
-#+begin_src bash
- nix flake update
-#+end_src
-
-**** Editing secrets
-The age key needs to exist. Then I can edit the secrets using :-
-#+begin_src bash
- #sops edit secrets/secrets.yaml
-#+end_src
-
-#+HTML: ├── hardware
-#+HTML: │ └── hardware.nix
-* Hardware
-I'll let the code comments explain the file here.
-
-#+begin_src nix :tangle hardware/hardware.nix :noweb tangle :mkdirp yes
- { pkgs, lib, user, config, ...} :
- {
- nixpkgs.hostPlatform = lib.mkDefault user.system; # x86_64-linux
- powerManagement.cpuFreqGovernor = lib.mkDefault "powersave"; # enable power saving on the cpu
-
- # update cpu microcode with firmware that allows redistribution
- hardware.cpu.intel.updateMicrocode = lib.mkDefault config.hardware.enableRedistributableFirmware;
-
- hardware = {
- # always enable bluetooth
- bluetooth.enable = true;
-
- # always enable graphics drivers and enable a bunch of layers for it (including vulkan validation)
- graphics = {
- enable = true;
- extraPackages = with pkgs; [
- vulkan-validation-layers # helps catch and debug vulkan crashes
- ];
- };
- };
-
- hardware.enableAllFirmware = true; # enable all firmware regardless of license
- }
-#+end_src
-
-#+HTML: ├── configuration
-#+HTML: │ ├── default.nix
-#+HTML: │ ├── apps
-#+HTML: │ │ ├── flatpak.nix
-#+HTML: │ │ └── packages.nix
-#+HTML: │ ├── core
-#+HTML: │ │ ├── cli.nix
-#+HTML: │ │ ├── files.nix
-#+HTML: │ │ ├── locale.nix
-#+HTML: │ │ ├── networking.nix
-#+HTML: │ │ └── nix-settings.nix
-#+HTML: │ ├── security
-#+HTML: │ │ └── sops.nix
-* Configuration
-This section describes the main system configuration for the computers that I have. Nix will look for a ~default.nix~ file if you give it a path to a folder to import. And ~default.nix~ looks as follows :-
-
-#+begin_src nix :tangle configuration/default.nix :noweb tangle :mkdirp yes
- { pkgs, user, ... } :
- {
- imports = [
- ./boot.nix
- ./login.nix
- ./cli.nix
- ./files.nix
- ./locale.nix
- ./nix-settings.nix
- ./networking.nix
- ./hyprland.nix
- ./services.nix
- ./audio.nix
- #./steam.nix
- #./sops.nix
- ./packages.nix
- ./flatpak.nix
- ];
-
- <>
-
- <>
-
- <>
-
- <>
-
- # enable the catppuccin theme for everything with mocha + blue accents
- catppuccin.enable = true;
- catppuccin.flavor = "mocha";
- catppuccin.accent = "blue";
-
- system.stateVersion = user.stateVersion;
- }
-#+end_src
-
-Whoa. Thats a lot of imports. Lets go through them one by one.
-
-#+HTML: │ └── services
-#+HTML: │ └── services.nix
-** Nix Settings
-These are global nix settings that configure the settings for the actual tool.
-
-#+begin_src nix :tangle configuration/nix-settings.nix :noweb tangle :mkdirp yes
- { pkgs, user, ... } :
- {
- nix.settings = {
- # enable flakes
- experimental-features = ["nix-command" "flakes"];
-
- # add a cache that speed up new applications by downloading binaries
- # from the trusted cache instead of compiling from sourcer
- substituters = [
- "https://nix-community.cachix.org"
- ];
- # trust the cache public key
- trusted-public-keys = [
- "nix-community.cachix.org-1:mB9FSh9qf2dCimDSUo8Zy7bkq5CX+/rkCWyvRCYg3Fs="
- ];
- };
-
- # allow proprietary software on this machine. I'm not a purist.
- nixpkgs.config.allowUnfree = true;
- # unityhub depends on this... for now
- nixpkgs.config.permittedInsecurePackages = [ "libxml2-2.13.8" ];
-
- # this declares how often old configurations are cleared up.
- # i cleanup anything older than a week, every week.
- nix.gc = {
- automatic = true;
- options = "--delete-older-than 7d";
- dates = "weekly";
- };
-
- programs = {
- # command line utility that makes applying changes easy and pretty
- nh = {
- enable = true;
- flake = "/home/${user.username}/system";
- };
- };
- }
-#+end_src
-
-#+HTML: │ ├── dev
-#+HTML: │ │ └── boot.nix
-** Boot
-This file has most of the settings the control how the computer boots up.
-
-#+begin_src nix :tangle configuration/boot.nix :noweb tangle :mkdirp yes
- { pkgs, ... } :
- {
- boot = {
- initrd = {
- verbose = false; # its a lot of logs. dont need it, unless we do.
- kernelModules = [ ]; # no kernel modules on boot
- };
-
- extraModulePackages = [ ]; # no extra packages on boot either
- kernelPackages = pkgs.linuxPackages_latest; # latest greatest linux kernel
- kernelParams = [ "silent" ]; # quiet those logs
-
- consoleLogLevel = 0; # quiten more logs
- plymouth.enable = true; # graphical boot animation instead
-
- supportedFilesystems = [ "ntfs" ]; # should see the ntfs (windows)
-
- loader = {
- systemd-boot.enable = true; # systemd-boot
- systemd-boot.configurationLimit = 2;
- efi.canTouchEfiVariables = true; # allow editing efi to edit the boot loader
-
-
- timeout = 5; # grub timeout to make a selection
- };
- };
- }
-#+end_src
-
-** Login
-Here we control what the login screen would look like. I'm using greetd's [[https://github.com/apognu/tuigreet][tuigreet]] for the ui.
-Doesn't match the rest of the aesthetic of the system (with hyprland), but I like its simplicity.
-
-#+begin_src nix :tangle configuration/login.nix :noweb tangle :mkdirp yes
- { pkgs, user, ... } :
- {
- environment.systemPackages = with pkgs; [
- tuigreet
- ];
-
- services.greetd = {
- enable = true;
- settings = {
- default_session = {
- command = pkgs.lib.mkForce "${pkgs.tuigreet}/bin/tuigreet --remember --time --time-format '%I:%M %p | %a • %h | %F'";
- };
- };
- };
- }
-
-#+end_src
-
-** CLI
-This is the initial system level configuration for the terminal that I use on this machine. Its just [[https://ohmyz.sh/][zsh]].
-
-#+begin_src nix :tangle configuration/cli.nix :noweb tangle :mkdirp yes
- { pkgs, user, ... }:
- {
- console.useXkbConfig = true;
- users.users.${user.username}.shell = pkgs.zsh;
-
- environment.shells = with pkgs; [ zsh ];
- programs.zsh.enable = true;
- environment.pathsToLink = [ "/share/zsh" ];
- }
-#+end_src
-
-** Files
-I use Thunar as the file explorer. Also setup a few plugins for [[https://docs.xfce.org/xfce/thunar/start][Thunar]] in this config.
-Along with that, a few other utilities like zip and enabling services to automount usb drives.
-
-#+begin_src nix :tangle configuration/files.nix :noweb tangle :mkdirp yes
- { pkgs, user, config, ... } :
- {
- environment.systemPackages = with pkgs; [
- zip
- unzip
- p7zip
- usbutils
- udiskie
- ];
-
- programs.thunar = {
- enable = true;
- plugins = with pkgs.xfce; [
- thunar-archive-plugin
- thunar-media-tags-plugin
- thunar-volman
- ];
- };
-
- programs.file-roller.enable = true; # thunar zip support
- programs.xfconf.enable = true; # to save thunar settings
-
- services = {
- gvfs.enable = true; # Mount, trash, and other functionalities
- tumbler.enable = true; # Thumbnail support for images
- udisks2.enable = true; # Auto mount usb drives
- };
- }
-#+end_src
-
-** Locale
-I live in Netherlands and would like all my locale and timezone settings to match. Except my default locale.
-#+begin_src nix :tangle configuration/locale.nix :noweb tangle :mkdirp yes
- { user, ... } :
- let
- locale = user.locale;
- defaultLocale = "nl_NL.UTF-8";
- in
- {
- # Set your time zone.
- time.timeZone = "Europe/Amsterdam";
-
- # Select internationalisation properties.
- i18n.defaultLocale = defaultLocale;
-
- i18n.extraLocaleSettings = {
- LC_ADDRESS = locale;
- LC_IDENTIFICATION = locale;
- LC_MEASUREMENT = locale;
- LC_MONETARY = locale;
- LC_NAME = locale;
- LC_NUMERIC = locale;
- LC_PAPER = locale;
- LC_TELEPHONE = locale;
- LC_TIME = defaultLocale;
- };
- }
-#+end_src
-
-** Networking
-Not much to see here. I want networking to be enabled. I want firewall as well.
-#+begin_src nix :tangle configuration/networking.nix :noweb tangle :mkdirp yes
- { pkgs, ... } : {
- networking = {
- # allow automatic ip assignment when connecting to a network
- useDHCP = pkgs.lib.mkDefault true;
- networkmanager.enable = true;
- firewall.enable = true;
-
- # let wifi info be NOT declarative, allowing user to configure wifi.
- wireless.userControlled.enable = true;
- wireless.iwd.enable = true;
- networkmanager.wifi.backend = "wpa_supplicant";
- };
-
- # tui to manage wifi networks
- environment.systemPackages = with pkgs; [ impala ];
- }
-#+end_src
-
-** Hyprland
-This is a big one because the DE needs so much configuration. This section mostly installs [[https://hyprland.org/][Hyprland]].
-The configuration is done in the home manager section.
-#+begin_src nix :tangle configuration/test/hyprland.nix :noweb tangle :mkdirp yes
- { pkgs, ... }:
- {
- nix.settings = {
- # add the hyprland cache so that we dont build hyprland from source
- substituters = [ "https://hyprland.cachix.org" ];
- trusted-public-keys = [
- "hyprland.cachix.org-1:a7pgxzMz7+chwVL3/pzj6jIBMioiJM7ypFP8PwtkuGc="
- ];
- };
-
- # these extra portals allow for things like screen sharing
- xdg = {
- portal = {
- enable = true;
- extraPortals = [
- pkgs.xdg-desktop-portal-wlr
- pkgs.xdg-desktop-portal-gtk
- ];
- };
- };
-
- environment.systemPackages = with pkgs; [
- hyprland # the actual package
- walker # launcher
- uwsm # wayland session manager
- hyprland-qtutils # needed by hyprland
- hyprpolkitagent # polkit agent
- grimblast # screenshot
- ];
-
- # we use uwsm to manage launching hyprland
- # uswm will add hyprland to the login sessions with tuigreet.
- programs = {
- uwsm.enable = true;
- uwsm.waylandCompositors = {
- hyprland = {
- prettyName = "Hyprland";
- comment = "Hyprland compositor managed by UWSM";
- binPath = "/run/current-system/sw/bin/Hyprland";
- };
- };
-
- hyprland = {
- withUWSM = true;
- enable = true;
- xwayland.enable = true;
- };
- };
-
- # this is mainly for the lock screen
- # lock.png is provided elsewhere
- services.xserver = {
- enable = true;
-
- desktopManager = {
- xterm.enable = false;
- };
-
-
- displayManager = {
- lightdm.background = ./lock.png;
- };
- };
-
- # this is a lot of env vars.
- # and this requires some cleanup
- # but hyprland moves fast and some of these are probably outdated already
- environment.sessionVariables = {
- XDG_SESSION_TYPE="wayland";
- XDG_CURRENT_DESKTOP="Hyprland";
- XDG_SESSION_DESKTOP="Hyprland";
- NIXOS_OZONE_WL="1";
- XCURSOR_SIZE="24";
- };
-
- # allow hyprlock (lockscreen) to lock user session
- security.pam.services.hyprlock = { };
- security.polkit.enable = true;
- security.pam.services.gdm.enableGnomeKeyring = true;
- }
-
-#+end_src
-
-** Services
-These are some of the services that I enable at the system level. Explanation in the comments.
-#+begin_src nix :tangle configuration/services.nix :noweb tangle :mkdirp yes
- { user, ...} :
- {
- services = {
- blueman.enable = true; # bluetooth manager
- fwupd.enable = true; # firmware updating service
- fstrim.enable = true; # ssd maintenance service
- thermald.enable = true; # thermal regulation service
- printing.enable = true; # printing services, cups
- gnome.gnome-keyring.enable = true; # keyring
- flatpak.enable = true; # allow installing things from flatpaks
- #flatpak remote-add --if-not-exists flathub https://flathub.org/repo/flathub.flatpakrepo
-
- # printer discovery
- avahi = {
- enable = true;
- nssmdns4 = true;
- openFirewall = true;
- };
- };
-
- virtualisation.docker.enable = true; # enable docker
- users.users.${user.username}.extraGroups = [ "docker" ]; # add self to docker user group
- }
-#+end_src
-
-** Audio
-This is still a work in progress, but it almost works. I enable all the audio related services, hoping everything is going to be okay.
-#+begin_src nix :tangle configuration/audio.nix :noweb tangle :mkdirp yes
- { pkgs, ...}:
- {
- environment.systemPackages = with pkgs; [ pamixer ];
- services.pipewire = {
- enable = true;
- alsa.enable = true;
- alsa.support32Bit = true;
- pulse.enable = true;
- jack.enable = true;
- };
-
- # pipewire needs realtime scheduling access
- security.rtkit.enable = true;
- }
-#+end_src
-
-** Sops
-#We use [[https://github.com/Mic92/sops-nix][sops]] to manage secrets on this machine.
-#+begin_src nix :tangle configuration/sops.nix :noweb tangle :mkdirp yes
-# { user, ...} :
-# {
-# sops.defaultSopsFile = ../secrets/secrets.yaml;
-# sops.defaultSopsFormat = "yaml";
-# sops.age.keyFile = "/home/${user.username}/.config/sops/age/keys.txt";
-#
-# sops.secrets.claude_key = { # anthropic claude api key, used in emacs
-# owner = "${user.username}";
-# };
-# }
-#+end_src
-
-#Sops requires a public ~.sops.yaml~ that dictates how the secrets are encrypted.
-#This contains the public key and path to the secrets file.
-
-#+begin_src yaml :tangle .sops.yaml :mkdirp yes
-#keys:
-# - &primary age1yq35g6mmlem0rhr47u6ewh8dctlwp9hj0s0ac60e4hrw9hjzlqms6crf7n
-#creation_rules:
-# - path_regex: secrets/secrets.yaml$
-# key_groups:
-# - age:
-# - *primary
-#+end_src
-
-** Miscellaneous Packages and Programs
-#+name: config-system-packages
-#+begin_src nix
- environment.systemPackages = with pkgs; [
- wget # fetch utility
- curl # more fetch utility
- binutils # executable utilities, like ld
- dmidecode # tool for dumping system info
- libnotify # notification daemon
- python3 # nice to have this ready for quick things
- cacert # certificate authority
- remmina # remote desktop app
- #rg # ripgrep
- wev # for finding keypresses
- tree # list foldetrtree's
- file # filinfo
- htop # sysmonitor
- solaar # logitech controller
- git # source control
- # jetbrains.pycharm # Dev and course environment
-
-
- ];
-
- # to enable icons with wlogout
- # https://github.com/catppuccin/nix/issues/584
- programs.gdk-pixbuf.modulePackages = [ pkgs.librsvg ];
-#+end_src
-
-#+name: config-programs
-#+begin_src nix
- programs = {
- nix-ld.enable = true; # helps with linking troubles with dynamic libraries
- appimage.enable = true; # allow appimage installations
- dconf.enable = true; # to save user settings
- gnupg.agent = {
- # pgp client
- enable = true;
- enableSSHSupport = true;
- };
- firefox.enable = true; # browser
- wireshark.enable = true; # vpn
- };
-#+end_src
-
-** Fonts
-Nothing much to see here. I love [[https://protesilaos.com/codelog/2025-02-12-aporetic-fonts-version-1-1-0/][Aporetic]], and I use it everywhere.
-#+name: config-fonts
-#+begin_src nix
- fonts.packages = with pkgs; [
- aporetic
- nerd-fonts.iosevka
- ];
-#+end_src
-
-** User Config
-This creates the user profile that I login with. Initially created during install.
-#+name: config-user
-#+begin_src nix
- users.users.${user.username} = {
- isNormalUser = true;
- description = "henrov";
- extraGroups = [
- "networkmanager" # allow editing network connections
- "wheel" # can do sudo
- "scanner" # access to the network scanner
- "lp" # access to the printer
- ];
- };
-#+end_src
-
-* Home
-I use home-manager to manage my user level dotfiles and configurations.
-Most of the "theme" of the system is decided here.
-I also use it to install programs that are okay with being installed at the user level instead of the system.
-
-#+begin_src nix :tangle home/default.nix :noweb tangle :mkdirp yes
- { pkgs, user, ... } :
- {
- imports = [
- ./waybar.nix
- ./wallpaper.nix
- ./lock.nix
- ./unity.nix
- ./hyprland.nix
- ./walker.nix
- ./theme.nix
- ./terminal.nix
- ./dev.nix
- ./emacs
- ];
-
- <>
-
- <>
-
- programs.home-manager.enable = true;
- }
-#+end_src
-Oof! Again with all the imports! We can go through them one at a time!
-
-** Waybar
-[[./.github/images/waybar.png]]
-
-Mostly styling and enabling modules in the [[https://github.com/Alexays/Waybar][top bar]].
-#+begin_src nix :tangle home/waybar.nix :noweb tangle :mkdirp yes
- {
- programs.waybar = {
- enable = true;
- settings = {
- mainBar = {
- layer = "top";
- height = 34;
- modules-left = [ "hyprland/workspaces" "hyprland/window" ];
- modules-right = [
- "idle_inhibitor"
- "pulseaudio"
- "network"
- "cpu"
- "memory"
- "temperature"
- "battery"
- "tray"
- "clock"
- ];
- "idle_inhibitor" = {
- format = "{icon}";
- format-icons = {
- activated = " ";
- deactivated = " ";
- };
- };
- "pulseaudio" = {
- "format" = "{volume}% {icon}";
- "format-bluetooth" = "{volume}% {icon}";
- "format-muted" = "";
- "format-icons"= {
- "headphones"= "";
- "headset"= "";
- "phone"= "";
- "portab le"= "";
- "default"= ["" ""];
- };
- "on-click"= "pavucontrol";
- };
- "network" = {
- "format-wifi" = " ({bandwidthDownBits})";
- "format-ethernet" = " ({bandwidthDownBits})";
- "format-disconnected" = "Disconnected ⚠";
- "tooltip-format-wifi" = "{essid} ({signalStrength}%)";
- "tooltip-format-ethernet" = "{ifname}: {ipaddr}/{cidr}";
- "on-click" = "impala";
- };
- "cpu".format = "{usage}% ";
- "cpu".tooltip = false;
- "temperature" = {
- "format" = "{temperatureC}°C ";
- };
- "temperature".tooltip = false;
- "tray".spacing = 10;
- "tray".icon-size = 14;
- "clock".format = "{:%a, %d %b %Y - %H:%M}";
- "clock".tooltip = false;
- "battery" = {
- "bat" = "BAT0";
- "states" = {
- "good" = 95;
- "warning" = 30;
- "critical" = 15;
- };
- "format" = "{capacity}% {icon}";
- "format-charging" = "{capacity}% ";
- "format-plugged" = "{capacity}% ";
- "format-icons" = ["" "" "" "" " "];
- };
- "memory".format = "{percentage}% ";
- };
- };
- style = ''
- ,* {
- font-family: Aporetic Sans Mono, Iosevka Nerd Font, Roboto, Helvetica, Arial, sans-serif;
- font-size: 13px;
- }
-
- window#waybar {
- background-color: @base;
- color: @text;
- transition-property: background-color;
- border-bottom: 0px solid rgba(0, 0, 0, 0);
- transition-duration: .5s;
- }
-
- #workspaces button {
- padding: 0 5px;
- background-color: transparent;
- border: none;
- border-radius: 0;
- color: @text;
- }
-
- #workspaces button:hover {
- background: @surface1;
- color: @text;
- }
-
- #workspaces button.active {
- background-color: @green;
- color: @base;
- box-shadow: inset 0 -3px @subtext1;
- }
-
- #clock,
- #idle_inhibitor
- #battery,
- #cpu,
- #memory,
- #temperature,
- #network,
- #pulseaudio,
- #tray {
- margin: 0 5px;
- padding: 0 2px;
- }
-
- #idle_inhibitor.activated {
- background-color: @green;
- }
-
- #battery.charging {
- color: @green;
- }
-
- @keyframes blink {
- to {
- background-color: #ffffff;
- color: black;
- }
- }
-
- #battery.warning:not(.charging) {
- color: white;
- animation-name: blink;
- animation-duration: 0.5s;
- animation-timing-function: linear;
- animation-iteration-count: infinite;
- animation-direction: alternate;
- }
-
- #window,
- #workspaces {
- margin: 0 4px;
- }
-
- .modules-left > widget:first-child > #workspaces {
- margin-left: 0;
- }
-
- .modules-right > widget:last-child > #workspaces {
- margin-right: 0;
- }
-
- #network.disconnected {
- background-color: @red;
- }
-
- #temperature.critical {
- background-color: @red;
- }
- '';
- };
- }
-#+end_src
-
-** Wallpaper
-
-[[./assets/background.png]]
-I use [[https://wiki.hyprland.org/Hypr-Ecosystem/hyprpaper/][hyprpaper]] for setting the wallpaper. The image is copied into the home folder when applying this configuration and the tool picks it from there.
-#+begin_src nix :tangle home/wallpaper.nix :noweb tangle :mkdirp yes
- { pkgs, ... }:
- {
- home.packages = with pkgs; [
- hyprpaper
- ];
-
- services.hyprpaper.enable = true;
- services.hyprpaper.settings = {
- ipc = "on";
- splash = false;
- splash_offset = 2.0;
-
- preload = [ "~/.background-image.png" ];
- wallpaper = [ ",~/.background-image.png" ];
- };
-
- home.file = {
- background = {
- source = ../assets/background.png;
- target = ".background-image.png";
- };
- };
- }
-
-#+end_src
-** Lock Screen
-The lock screen configured using [[https://wiki.hyprland.org/Hypr-Ecosystem/hyprlock/][hyprlock]].
-I use [[https://wiki.hyprland.org/Hypr-Ecosystem/hypridle/][hypridle]] to detect idle time and use wlogout to show a logout menu.
-They are configured below.
-#+begin_src nix :tangle home/lock.nix :noweb tangle :mkdirp yes
- { pkgs, ... } :
- {
- home.packages = with pkgs; [
- hyprlock
- hypridle
- wlogout
- ];
-
-
- home.file = {
- lock = {
- source = ../assets/lock.png;
- target = ".lock.png";
- };
- };
-
- services = {
- # hypridle to
- # 150 seconds - turn of monitor
- # 300 seconds - lock screen
- # 330 seconds - turn of monitor
- # 30 minutes - put to sleep
- hypridle = {
- enable = true;
- settings = {
- general = {
- lock_cmd = "pidof hyprlock || hyprlock"; # avoid starting multiple hyprlock instances.
- before_sleep_cmd = "loginctl lock-session"; # lock before suspend.
- after_sleep_cmd = "hyprctl dispatch dpms on"; # to avoid having to press a key twice to turn on the display.
- };
-
- listener = [
- {
- timeout = 150; # 2.5min.
- on-timeout = "brightnessctl -s set 10"; # set monitor backlight to minimum, avoid 0 on OLED monitor.
- on-resume = "brightnessctl -r"; # monitor backlight restore.
- }
- {
- timeout = 300; # 5min
- on-timeout = "loginctl lock-session"; # lock screen when timeout has passed
- }
- {
- timeout = 330; # 5.5min
- on-timeout = "hyprctl dispatch dpms off"; # screen off when timeout has passed
- on-resume = "hyprctl dispatch dpms on && brightnessctl -r"; # screen on when activity is detected after timeout has fired.
- }
- {
- timeout = 1800; # 30min
- on-timeout = "systemctl suspend"; # suspend pc
- }
- ];
-
- };
- };
- };
-
-
-
- programs.wlogout = {
- enable = true;
- layout = [
- {
- "label" = "lock";
- "action" = "hyprlock";
- "text" = "Lock";
- "keybind" = "l";
- }
- {
- "label" = "shutdown";
- "action" = "systemctl poweroff";
- "text" = "Shutdown";
- "keybind" = "s";
- }
- {
- "label" = "suspend";
- "action" = "systemctl suspend";
- "text" = "Suspend";
- "keybind" = "u";
- }
- {
- "label" = "reboot";
- "action" = "systemctl reboot";
- "text" = "Reboot";
- "keybind" = "r";
- }
- {
- "label" = "hibernate";
- "action" = "systemctl hibernate";
- "text" = "Hibernate";
- "keybind" = "h";
- }
- {
- "label" = "reboot";
- "action" = "systemctl reboot";
- "text" = "Reboot";
- "keybind" = "r";
- }
- ];
- };
-
- catppuccin.wlogout.iconStyle = "wleave";
-
- programs.hyprlock = {
- enable = true;
- settings = {
- auth = {
- fingerprint = {
- enabled = true;
- };
- };
-
- background = {
- path = "~/.lock.png";
- color = "$base";
- };
-
- label = {
- monitor = "";
- text = "$TIME";
- color = "$text";
- font_size = 90;
- position = "0, 0";
- halign = "center";
- valign = "top";
- };
-
- input-field = {
- monitor = "";
- size = "300, 60";
- outline_thickness = 4;
- dots_size = 0.2;
- dots_spacing = 0.2;
- dots_center = true;
- outer_color = "$accent";
- inner_color = "$surface0";
- font_color = "$text";
- fade_on_empty = true;
- placeholder_text = '' Logged in as $USER'';
- hide_input = false;
- check_color = "$accent";
- fail_color = "$red";
- fail_text = ''$FAIL ($ATTEMPTS)'';
- capslock_color = "$yellow";
- position = "0, -47";
- halign = "center";
- valign = "center";
- };
- };
- };
-
- catppuccin.hyprlock.enable = true;
- catppuccin.hyprlock.flavor = "mocha";
- catppuccin.hyprlock.accent = "blue";
- catppuccin.hyprlock.useDefaultConfig = false; # we use our own
- }
-
-#+end_src
-** Unity
-I work with the [[https://unity.com/][Unity Game Engine]] and I have the unity hub installed globally, instead of in a project flake.
-Often I work with dotnet directly inside of unity and so we set that up too.
-#+begin_src nix :tangle home/unity.nix :noweb tangle :mkdirp yes.
- { pkgs, ... }:
- {
- home.packages = with pkgs; [
- (pkgs.unityhub.override {
- extraPkgs = pkgs: with pkgs; [
- dotnet-sdk
- ];
- })
- ];
-
- }
-#+end_src
-
-** Hyprland
-This configures the desktop environment along with the peripherals. The comments should explain whats happening.
-#+begin_src nix :tangle home/hyprland.nix :noweb tangle :mkdirp yes.
- {
- # required for the default Hyprland config
- programs.kitty.enable = true;
-
- services.hyprpolkitagent.enable = true;
-
- # enable Hyprland
- wayland.windowManager.hyprland.enable = true;
-
- # we start hyprland using uwsm
- wayland.windowManager.hyprland.systemd.enable = false;
-
- # hyprland.conf
- wayland.windowManager.hyprland.settings = {
- exec-once = [
- # read in env vars
- "dbus-update-activation-environment --systemd --all"
- # start waybar
- "uwsm app -- waybar"
- ];
-
- input = {
- follow_mouse = "1";
-
- touchpad = {
- natural_scroll = "no";
- scroll_factor = 0.5;
- };
-
- scroll_factor = 0.5;
-
- accel_profile = "adaptive";
- sensitivity = -0.5; # -1.0 - 1.0, 0 means no modification.
-
- kb_layout = "us";
-
- # very emacs specific, i use caps as an extra ctrl key
- kb_options = "ctrl:nocaps";
- };
-
- cursor = {
- no_hardware_cursors = "true";
- };
-
- general = {
- gaps_in = 2;
- gaps_out = 4;
- border_size = 2;
- "col.active_border" = "$blue $green 45deg";
- "col.inactive_border" = "$base";
-
- layout = "dwindle";
- };
-
- decoration = {
- rounding = 5;
- };
-
- animations = {
- enabled = "yes";
- bezier = "myBezier, 0.05, 0.9, 0.1, 1.05";
-
- animation = [
- "windows, 1, 7, myBezier"
- "windowsOut, 1, 7, default, popin 80%"
- "border, 1, 10, default"
- "borderangle, 1, 8, default"
- "fade, 1, 7, default"
- "workspaces, 1, 6, default"
- ];
- };
-
- dwindle = {
- pseudotile = "yes";
- preserve_split = "yes";
- };
-
- misc = {
- disable_hyprland_logo = true;
- focus_on_activate = true;
- };
-
- "$mainMod" = "SUPER";
-
- bind = [
- "$mainMod, Return, exec, uwsm app -- kitty"
- # use walker to show exec menu
- "$mainMod, Space, exec, walker"
- "$mainMod, P, pseudo"
- "$mainMod, J, togglesplit"
-
- # grimblast
- "$mainMod_SHIFT, p, exec, grimblast -n -f copysave active"
- "$mainMod_SHIFT, a, exec, grimblast -n -f copysave area"
- "$mainMod_ALT, p, exec, grimblast -n -f copysave output"
- "$mainMod_CTRL, p, exec, grimblast -n -f copysave screen"
-
- # Terminal / launcher / kill / reload
- "$mainMod, RETURN, exec, kitty"
- "$mainMod, D, exec, wofi --show drun"
- "$mainMod, Q, killactive"
- "$mainMod_SHIFT, Q, exit"
- "$mainMod_SHIFT, R, exec, hyprctl reload"
- "$mainMod_SHIFT, S, exec, wlogout"
-
- # Default browser
- "$mainMod, W, exec, xdg-open https://about:blank"
-
- # Focus movement
- "$mainMod, H, movefocus, l"
- "$mainMod, L, movefocus, r"
- "$mainMod, K, movefocus, u"
- "$mainMod, J, movefocus, d"
- "$mainMod, left, movefocus, l"
- "$mainMod, right, movefocus, r"
- "$mainMod, up, movefocus, u"
- "$mainMod, down, movefocus, d"
- # Keybindings #
-
- # Move windows
- "$mainMod_SHIFT, H, movewindow, l"
- "$mainMod_SHIFT, L, movewindow, r"
- "$mainMod_SHIFT, K, movewindow, u"
- "$mainMod_SHIFT, J, movewindow, d"
- "$mainMod_SHIFT, left, movewindow, l"
- "$mainMod_SHIFT, right, movewindow, r"
- "$mainMod_SHIFT, up, movewindow, u"
- "$mainMod_SHIFT, down, movewindow, d"
-
- # Resize windows
- "$mainMod CTRL, H, resizeactive, -30 0"
- "$mainMod CTRL, L, resizeactive, 30 0"
- "$mainMod CTRL, K, resizeactive, 0 -30"
- "$mainMod CTRL, J, resizeactive, 0 30"
-
- # Floating / fullscreen
- "$mainMod, V, togglefloating"
- "$mainMod, F, fullscreen, 0"
- "$mainMod_SHIFT, F, fullscreen, 1"
-
- # Workspaces
- "$mainMod, 1, workspace, 1"
- "$mainMod, 2, workspace, 2"
- "$mainMod, 3, workspace, 3"
- "$mainMod, 4, workspace, 4"
- "$mainMod, 5, workspace, 5"
- "$mainMod, 6, workspace, 6"
- "$mainMod, 7, workspace, 7"
- "$mainMod, 8, workspace, 8"
- "$mainMod, 9, workspace, 9"
- "$mainMod, 0, workspace, 10"
-
- "$mainMod_SHIFT, 1, movetoworkspace, 1"
- "$mainMod_SHIFT, 2, movetoworkspace, 2"
- "$mainMod_SHIFT, 3, movetoworkspace, 3"
- "$mainMod_SHIFT, 4, movetoworkspace, 4"
- "$mainMod_SHIFT, 5, movetoworkspace, 5"
- "$mainMod_SHIFT, 6, movetoworkspace, 6"
- "$mainMod_SHIFT, 7, movetoworkspace, 7"
- "$mainMod_SHIFT, 8, movetoworkspace, 8"
- "$mainMod_SHIFT, 9, movetoworkspace, 9"
- "$mainMod_SHIFT, 0, movetoworkspace, 10"
-
- # Cycle workspaces
- "$mainMod, mouse_down, workspace, e+1"
- "$mainMod, mouse_up, workspace, e-1"
-
- # Mouse drag
- "$mainMod, mouse:272, movewindow"
- "$mainMod, mouse:273, resizewindow"
-
- #########################
- # Audio (pamixer)
- #########################
- "XF86AudioRaiseVolume, exec, pamixer -i 5"
- "XF86AudioLowerVolume, exec, pamixer -d 5"
- "XF86AudioMute, exec, pamixer -t"
- "XF86AudioMicMute, exec, pamixer --default-source -t"
-
- #########################
- # Media (playerctl)
- #########################
- "XF86AudioPlay, exec, playerctl play-pause"
- "XF86AudioPause, exec, playerctl pause"
- "XF86AudioNext, exec, playerctl next"
- "XF86AudioPrev, exec, playerctl previous"
- "XF86AudioStop, exec, playerctl stop"
-
- #########################
- # Brightness (brightnessctl)
- #########################
- "XF86MonBrightnessUp, exec, brightnessctl set +10%"
- "XF86MonBrightnessDown, exec, brightnessctl set 10%-"
- "XF86KbdBrightnessUp, exec, brightnessctl -d '*kbd_backlight*' set +10%"
- "XF86KbdBrightnessDown, exec, brightnessctl -d '*kbd_backlight*' set 10%-"
-
- #########################
- # Power / session
- #########################
- "XF86Sleep, exec, systemctl suspend"
- "XF86PowerOff, exec, systemctl poweroff"
- "XF86WakeUp, exec, systemctl suspend"
-
-
- #########################
- # Start apps
- #########################
- "CTRLALT, B, exec, flatpak run eu.betterbird.Betterbird"
- "CTRLALT, S, exec, spotify"
- "CTRLALT, z, exec, flatpak run app.zen_browser.zen"
-
- "$mainMod_SHIFT, S, exec, wlogout"
- ];
- };
- }
-#+end_src
-
-** Walker
-[[https://github.com/abenz1267/walker][This]] is how I launch applications. It is bound to Win+Space in the hyprland config above.
-#+begin_src nix :tangle home/walker.nix :noweb tangle :mkdirp yes.
- {
- services.walker.enable = true;
- services.walker.settings = {
- close = "ctrl g";
- next = "ctrl n";
- previous = "ctrl p";
- quick_activate = ["1" "2" "3" "4"];
- };
- }
-#+end_src
-
-** Theme
-I use the [[https://catppuccin.com/][Catppuccin]] almost everywhere. The nix module integrates almost automatically everywhere (except gtk).
-You'll notice the color values in multiple places outside this as well.
-#+begin_src nix :tangle home/theme.nix :noweb tangle :mkdirp yes.
- { pkgs, ...}:
- {
- gtk = {
- enable = true;
- colorScheme = "dark";
- theme = {
- name = "Catppuccin-GTK-Grey-Dark-Compact";
- package = (pkgs.magnetic-catppuccin-gtk.override {
- accent = [ "grey" ];
- shade = "dark";
- tweaks = [ "black" ];
- size = "compact";
- });
- };
-
- iconTheme.name = "Papirus-Dark";
- };
-
- catppuccin.enable = true;
- catppuccin.flavor = "mocha";
- catppuccin.accent = "blue";
- catppuccin.gtk.icon.enable = true;
- catppuccin.cursors.enable = true;
- }
- #+end_src
-
-** Terminal
-[[https://alacritty.org/][Alacritty]] is my terminal program. The snippet below configures how it looks.
-#+begin_src nix :tangle home/terminal.nix :noweb tangle :mkdirp yes
- {
- programs = {
- #
- alacritty = {
- enable = true;
- settings = {
- font.normal.family = "Aporetic Sans Mono";
- font.size = 12;
- terminal.shell.program = "zsh";
-
- window = {
- padding.x = 4;
- padding.y = 4;
- };
- };
- };
- };
-
- catppuccin.alacritty.enable = true;
- catppuccin.alacritty.flavor = "mocha";
- }
-
-#+end_src
-
-** Dev Tools
-All the miscellaneous dev tools on this computer.
-#+begin_src nix :tangle home/dev.nix :noweb tangle :mkdirp yes
- { user, pkgs, ... }:
- {
- programs = {
- vscode.enable = true; # yes, sometimes i like to dabble
- vim.enable = true; # and this one too
- ripgrep.enable = true; # fast text search across projects
- btop.enable = true; # even better task manager
-
- # nicer terminal info
- starship = {
- enable = true;
- enableZshIntegration = true;
- enableBashIntegration = true;
- };
-
- # fuzzy finder
- fzf = {
- enable = true;
- enableZshIntegration = true;
- enableBashIntegration = true;
- };
-
- # better cd
- zoxide = {
- enable = true;
- enableZshIntegration = true;
- enableBashIntegration = true;
- };
-
- # better ls
- eza = {
- enable = true;
- enableZshIntegration = true;
- enableBashIntegration = true;
- };
-
- # this is mainly for integration with nix flakes in individual projects
- direnv = {
- enable = true;
- enableZshIntegration = true;
- enableBashIntegration = true;
- nix-direnv.enable = true;
- };
-
- # zsh everywhere with oh-my-zsh
- zsh = {
- enable = true;
- oh-my-zsh = {
- enable = true;
- plugins = [ "git" ];
- theme = "robbyrussell";
- };
-
- shellAliases = {
- cd = "z"; # zoxide
- };
-
- # for emacs-eat package
- initContent = pkgs.lib.mkOrder 1200 ''
- [ -n "$EAT_SHELL_INTEGRATION_DIR" ] && \
- source "$EAT_SHELL_INTEGRATION_DIR/zsh"
- '';
- };
-
- # git with lfs
- git = {
- lfs.enable = true;
- enable = true;
- };
- };
- }
-#+end_src
-
-** Other Settings
-Some repeated info from the configuration.
-*** Home User
-#+name: home-user
-#+begin_src nix
- home.username = "${user.username}";
- home.homeDirectory = pkgs.lib.mkDefault "/home/${user.username}";
- home.stateVersion = user.stateVersion;
-#+end_src
-
-*** Home Packages
-A bunch of programs that I use.
-#+name: home-packages
-#+begin_src nix
- home.packages = with pkgs; [
- audacity # audio recording
- handbrake # video transcoding
- xdg-utils # utils, for screensharing
- vlc # media player
- pavucontrol # audio control
-# everdo # gtd tool
- spotify # music player
- simple-scan # scanner software
- # gimp2 # image editor
- mpv # media player
- kdePackages.kate # best texteditor
- libreoffice # office suite
- obsidian # knowegde base
- vivaldi # browser
- brave # browser
- kdePackages.kdeconnect-kde # KDE Connect
- pamixer # volumemixer
-
- ];
-
- services.dunst.enable = true; # notifications daemon
-
- programs.obs-studio.enable = true; # screen recording tool
-#+end_src
-
-* Emacs
-I practically live inside emacs. The configuration for it is a mix between init.el and the nix configuration.
-Nix allows me to install emacs packages as part of the configuration which is most of the following file.
-I install the nix community provided emacs overlay that lets me have the latest emacs with pgtk ui (for wayland).
-Comments describe the emacs package and what it does.
-#+begin_src nix :tangle home/emacs/default.nix :noweb tangle :mkdirp yes
- { pkgs, ... }:
- {
- programs.emacs = {
- enable = true;
- # install with tree sitter enabled
- package = (pkgs.emacs-pgtk.override { withTreeSitter = true; });
- extraPackages = epkgs: [
- # also install all tree sitter grammars
- epkgs.manualPackages.treesit-grammars.with-all-grammars
- epkgs.nerd-icons # nerd fonts support
- epkgs.doom-modeline # model line
- epkgs.diminish # hides modes from modeline
- epkgs.eldoc # doc support
- epkgs.pulsar # pulses the cursor when jumping about
- epkgs.which-key # help porcelain
- epkgs.expreg # expand region
- epkgs.vundo # undo tree
- epkgs.puni # structured editing
- epkgs.avy # jumping utility
- epkgs.consult # emacs right click
- epkgs.vertico # minibuffer completion
- epkgs.marginalia # annotations for completions
- epkgs.crux # utilities
- epkgs.magit # git porcelain
- epkgs.nerd-icons-corfu # nerd icons for completion
- epkgs.corfu # completion
- epkgs.cape # completion extensions
- epkgs.orderless # search paradigm
- epkgs.yasnippet # snippets support
- epkgs.yasnippet-snippets # commonly used snippets
- epkgs.rg # ripgrep
- epkgs.exec-path-from-shell # load env and path
- epkgs.eat # better shell
- epkgs.rust-mode # rust mode (when rust-ts doesn't cut it)
- epkgs.rustic # more rust things
- epkgs.nix-mode # nix lang
- epkgs.hcl-mode # hashicorp file mode
- epkgs.shell-pop # quick shell popup
- epkgs.envrc # support for loading .envrc
- epkgs.nixpkgs-fmt # format nix files
- epkgs.f # string + file utilities
- epkgs.gptel # llm chat (mainly claude)
-
- epkgs.catppuccin-theme # catppuccin theme
- epkgs.eldoc-box # docs in a box
- epkgs.sideline # mainly for flymake errors on the side
- epkgs.sideline-flymake # mainly for flymake errors on the side
- epkgs.sideline-eglot # mainly for flymake errors on the side
- ];
- };
-
- home.sessionVariables = {
- EDITOR = "emacs";
- XDG_SCREENSHOTS_DIR = "~/screenshots";
- };
-
- home.file = {
- emacs-init = {
- source = ./early-init.el;
- target = ".emacs.d/early-init.el";
- };
-
- emacs = {
- source = ./init.el;
- target = ".emacs.d/init.el";
- };
- };
-
- services.nextcloud-client = {
- enable = true;
- };
- }
-#+end_src
-
-** Early Initialization
-There are some emacs settings that can be configured before the gui shows up.
-And some of them help increase performance and let the gui show up that much faster.
-These are listed here.
-
-#+begin_src emacs-lisp :tangle home/emacs/early-init.el :mkdirp yes
- ;;; package --- early init -*- lexical-binding: t -*-
-
- ;;; Commentary:
- ;;; Prevents white flash and better Emacs defaults
-
- ;;; Code:
- (set-language-environment "UTF-8")
-
- (setq-default
- default-frame-alist
- '((background-color . "#1e1e2e")
- (bottom-divider-width . 1) ; Thin horizontal window divider
- (foreground-color . "#bac2de") ; Default foreground color
- (fullscreen . maximized) ; Maximize the window by default
- (horizontal-scroll-bars . nil) ; No horizontal scroll-bars
- (left-fringe . 8) ; Thin left fringe
- (menu-bar-lines . 0) ; No menu bar
- (right-divider-width . 1) ; Thin vertical window divider
- (right-fringe . 8) ; Thin right fringe
- (tool-bar-lines . 0) ; No tool bar
- (undecorated . t) ; Remove extraneous X decorations
- (vertical-scroll-bars . nil)) ; No vertical scroll-bars
-
- user-full-name "Henrov henrov" ; ME!
-
- ;; memory configuration
- ;; Higher garbage collection threshold, prevents frequent gc locks, reset later
- gc-cons-threshold most-positive-fixnum
- ;; Ignore warnings for (obsolete) elisp compilations
- byte-compile-warnings '(not obsolete)
- ;; And other log types completely
- warning-suppress-log-types '((comp) (bytecomp))
- ;; Large files are okay in the new millenium.
- large-file-warning-threshold 100000000
- ;; dont show garbage collection messages at startup, will reset later
- garbage-collection-messages nil
- ;; native compilation
- package-native-compile t
- native-comp-warning-on-missing-source nil
- native-comp-async-report-warnings-errors 'silent
-
-
- ;; Read more based on system pipe capacity
- read-process-output-max (max (* 10240 10240) read-process-output-max)
-
- ;; scroll configuration
- scroll-margin 0 ; Lets scroll to the end of the margin
- scroll-conservatively 100000 ; Never recenter the window
- scroll-preserve-screen-position 1 ; Scrolling back and forth
-
- ;; frame config
- ;; Improve emacs startup time by not resizing to adjust for custom settings
- frame-inhibit-implied-resize t
- ;; Dont resize based on character height / width but to exact pixels
- frame-resize-pixelwise t
-
- ;; backups & files
- backup-directory-alist '(("." . "~/.backups/")) ; Don't clutter
- backup-by-copying t ; Don't clobber symlinks
- create-lockfiles nil ; Don't have temp files
- delete-old-versions t ; Cleanup automatically
- kept-new-versions 6 ; Update every few times
- kept-old-versions 2 ; And cleanup even more
- version-control t ; Version them backups
- delete-by-moving-to-trash t ; Dont delete, send to trash instead
-
- ;; startup
- inhibit-startup-screen t ; I have already done the tutorial. Twice
- inhibit-startup-message t ; I know I am ready
- inhibit-startup-echo-area-message t ; Yep, still know it
- initial-scratch-message nil ; I know it is the scratch buffer!
- initial-buffer-choice nil
- inhibit-startup-buffer-menu t
- inhibit-x-resources t
- initial-major-mode 'fundamental-mode
-
- pgtk-wait-for-event-timeout 0.001 ; faster child frames
-
- ad-redefinition-action 'accept ; dont care about legacy things being redefined
- inhibit-compacting-font-caches t
-
- ;; tabs
- tab-width 4 ; Always tab 4 spaces.
- indent-tabs-mode nil ; Never use actual tabs.
-
- ;; rendering
- cursor-in-non-selected-windows nil ; dont render cursors other windows
-
- ;; packages
- use-package-always-defer t
-
- load-prefer-newer t
-
- default-input-method nil
-
- use-dialog-box nil
-
- use-file-dialog nil
-
- use-package-expand-minimally t
-
- package-enable-at-startup nil
-
- use-package-enable-imenu-support t
-
- auto-mode-case-fold nil ; No second pass of case-insensitive search over auto-mode-alist.
-
- package-archives '(("melpa" . "https://melpa.org/packages/")
- ("gnu" . "https://elpa.gnu.org/packages/")
- ("nongnu" . "https://elpa.nongnu.org/nongnu/")
- ("melpa-stable" . "https://stable.melpa.org/packages/"))
-
- package-archive-priorities '(("gnu" . 99)
- ("nongnu" . 80)
- ("melpa" . 70)
- ("melpa-stable" . 50))
- )
- ;;; early-init.el ends here
-#+end_src
-
-** Initialization
-Now starts the main emacs configuration.
-
-#+begin_src emacs-lisp :tangle home/emacs/init.el :mkdirp yes
- ;;; package --- Summary - My minimal Emacs init file -*- lexical-binding: t -*-
-
- ;;; Commentary:
- ;;; Simple Emacs setup I carry everywhere
-
- ;;; Code:
- (setq custom-file (locate-user-emacs-file "custom.el"))
- (load custom-file 'noerror) ;; no error on missing custom file
-
- (require 'package)
- (package-initialize)
-
- (defun reset-custom-vars ()
- "Resets the custom variables that were set to crazy numbers"
- (setopt gc-cons-threshold (* 1024 1024 100))
- (setopt garbage-collection-messages t))
-
- (use-package emacs
- :custom
- (native-comp-async-query-on-exit t)
- (read-answer-short t)
- (use-short-answers t)
- (enable-recursive-minibuffers t)
- (which-func-update-delay 1.0)
- (visible-bell nil)
- (custom-buffer-done-kill t)
- (whitespace-line-column nil)
- (x-underline-at-descent-line t)
- (imenu-auto-rescan t)
- (uniquify-buffer-name-style 'forward)
- (confirm-nonexistent-file-or-buffer nil)
- (create-lockfiles nil)
- (make-backup-files nil)
- (kill-do-not-save-duplicates t)
- (sentence-end-double-space nil)
- (treesit-enabled-modes t)
- :init
- ;; base visual
- (menu-bar-mode -1) ;; no menu bar
- (toggle-scroll-bar -1) ;; no scroll bar
- (tool-bar-mode -1) ;; no tool bar either
- (blink-cursor-mode -1) ;; stop blinking
-
- ;; font of the century
- (set-frame-font "Aporetic Sans Mono 12" nil t)
-
- :bind
- (("C-" . pixel-scroll-precision) ; dont zoom in please, just scroll
- ("C-" . pixel-scroll-precision) ; dont zoom in either, just scroll
- ("C-x k" . kill-current-buffer)) ; kill the buffer, dont ask
- :hook
- (text-mode . delete-trailing-whitespace-mode)
- (prog-mode . delete-trailing-whitespace-mode)
- (after-init . global-display-line-numbers-mode) ;; always show line numbers
- (after-init . column-number-mode) ;; column number in the mode line
- (after-init . size-indication-mode) ;; file size in the mode line
- (after-init . pixel-scroll-precision-mode) ;; smooth mouse scroll
- (after-init . electric-pair-mode) ;; i mean ... parens should auto create
- (after-init . reset-custom-vars)
- )
-
- (use-package autorevert
- :ensure nil
- :custom
- (auto-revert-interval 3)
- (auto-revert-remote-files nil)
- (auto-revert-use-notify t)
- (auto-revert-avoid-polling nil)
- (auto-revert-verbose t)
- :hook
- (after-init . global-auto-revert-mode))
-
- (use-package recentf
- :ensure nil
- :commands (recentf-mode recentf-cleanup)
- :hook
- (after-init . recentf-mode)
- :custom
- (recentf-auto-cleanup 'never)
- (recentf-exclude
- (list "\\.tar$" "\\.tbz2$" "\\.tbz$" "\\.tgz$" "\\.bz2$"
- "\\.bz$" "\\.gz$" "\\.gzip$" "\\.xz$" "\\.zip$"
- "\\.7z$" "\\.rar$"
- "COMMIT_EDITMSG\\'"
- "\\.\\(?:gz\\|gif\\|svg\\|png\\|jpe?g\\|bmp\\|xpm\\)$"
- "-autoloads\\.el$" "autoload\\.el$"))
-
- :config
- ;; A cleanup depth of -90 ensures that `recentf-cleanup' runs before
- ;; `recentf-save-list', allowing stale entries to be removed before the list
- ;; is saved by `recentf-save-list', which is automatically added to
- ;; `kill-emacs-hook' by `recentf-mode'.
- (add-hook 'kill-emacs-hook #'recentf-cleanup -90))
-
- (use-package savehist
- :ensure nil
- :commands (savehist-mode savehist-save)
- :hook
- (after-init . savehist-mode)
- :custom
- (savehist-autosave-interval 600)
- (savehist-additional-variables
- '(kill-ring ; clipboard
- register-alist ; macros
- mark-ring global-mark-ring ; marks
- search-ring regexp-search-ring)))
-
- (use-package hl-line
- :ensure nil
- :custom
- (hl-line-sticky-flag nil)
- (global-hl-line-sticky-flag nil)
- :hook
- (after-init . global-hl-line-mode))
-
- (use-package saveplace
- :ensure nil
- :commands (save-place-mode save-place-local-mode)
- :hook
- (after-init . save-place-mode)
- :custom
- (save-place-limit 400))
-
- (use-package nerd-icons
- :custom
- ;; disable bright icon colors
- (nerd-icons-color-icons nil))
-
- (use-package doom-modeline
- :custom
- (inhibit-compacting-font-caches t) ;; speed
- (doom-modeline-buffer-file-name-style 'relative-from-project)
- (doom-modeline-major-mode-icon nil) ;; distracting icons, no thank you
- (doom-modeline-buffer-encoding nil) ;; everything is utf-8 anyway
- (doom-modeline-buffer-state-icon nil) ;; the filename already shows me
- (doom-modeline-lsp nil) ;; lsp state is too distracting, too often
- :hook (after-init . doom-modeline-mode))
-
- (load-theme 'catppuccin :no-confirm)
-
- (use-package diminish :demand t) ;; declutter the modeline
- (use-package eldoc
- :diminish eldoc-mode
- :custom
- (eldoc-echo-area-use-multiline-p nil)) ;; docs for everything
-
- (use-package eldoc-box
- :defer t
- :config
- (set-face-background 'eldoc-box-border (catppuccin-color 'green))
- (set-face-background 'eldoc-box-body (catppuccin-color 'base))
- :bind
- (("M-h" . eldoc-box-help-at-point)))
-
- (use-package pulsar
- :commands pulsar-global-mode pulsar-recenter-top pulsar-reveal-entry
- :init
- (defface pulsar-catppuccin
- `((default :extend t)
- (((class color) (min-colors 88) (background light))
- :background ,(catppuccin-color 'sapphire))
- (((class color) (min-colors 88) (background dark))
- :background ,(catppuccin-color 'sapphire))
- (t :inverse-video t))
- "Alternative nord face for `pulsar-face'."
- :group 'pulsar-faces)
- :custom
- (pulsar-face 'pulsar-catppuccin)
- :hook
- (after-init . pulsar-global-mode))
-
- (use-package which-key
- :commands which-key-mode
- :diminish which-key-mode
- :hook
- (after-init . which-key-mode))
-
- (use-package expreg
- :bind ("M-m" . expreg-expand))
-
- (use-package vundo) ;; undo tree
-
- ;; better structured editing
- (use-package puni
- :commands puni-global-mode
- :hook
- (after-init . puni-global-mode))
-
- (use-package avy
- :bind
- ("M-i" . avy-goto-char-2)
- :custom
- (avy-background t))
-
- (use-package consult
- :bind
- ("C-x b" . consult-buffer) ;; orig. switch-to-buffer
- ("M-y" . consult-yank-pop) ;; orig. yank-pop
- ("M-g M-g" . consult-goto-line) ;; orig. goto-line
- ("M-g i" . consult-imenu) ;; consult version is interactive
- ("M-g r" . consult-ripgrep) ;; find in project also works
- :custom
- (consult-narrow-key "<"))
-
- (use-package vertico
- :commands vertico-mode
- :custom
- (read-file-name-completion-ignore-case t)
- (read-buffer-completion-ignore-case t)
- (completion-ignore-case t)
- (enable-recursive-minibuffers t)
- (minibuffer-prompt-properties '(read-only t cursor-intangible t face minibuffer-prompt))
- :init
- (vertico-mode)
- :hook
- (minibuffer-setup-hook . cursor-intangible-mode))
-
- (use-package marginalia
- :commands marginalia-mode
- :hook (after-init . marginalia-mode))
-
- (use-package crux
- :bind
- ("C-c M-e" . crux-find-user-init-file)
- ("C-c C-w" . crux-transpose-windows)
- ("C-c M-d" . crux-find-current-directory-dir-locals-file)
- ("C-a" . crux-move-beginning-of-line))
-
- (use-package magit
- :bind (("C-M-g" . magit-status)))
-
- (use-package nerd-icons-corfu
- :commands nerd-icons-corfu-formatter
- :defines corfu-margin-formatters)
-
- (use-package corfu
- :commands global-corfu-mode
- :custom
- (corfu-cycle t)
- (corfu-auto t)
- (corfu-auto-delay 1)
- (corfu-auto-prefix 3)
- (corfu-separator ?_)
- :hook
- (after-init . global-corfu-mode)
- :config
- (add-to-list 'corfu-margin-formatters #'nerd-icons-corfu-formatter))
-
- (use-package cape)
-
- (use-package orderless
- :custom
- (completion-styles '(orderless partial-completion basic))
- (completion-category-defaults nil)
- (completion-category-overrides nil))
-
- (use-package yasnippet
- :commands yas-global-mode
- :diminish yas-minor-mode
- :hook
- (after-init . yas-global-mode))
-
- (use-package yasnippet-snippets :after yasnippet)
-
- (use-package exec-path-from-shell
- :commands exec-path-from-shell-initialize
- :custom
- (exec-path-from-shell-arguments nil)
- :hook
- (after-init . exec-path-from-shell-initialize))
-
- (use-package nixpkgs-fmt
- :custom
- (nixpkgs-fmt-command "nixfmt"))
-
- (use-package eat
- :bind
- (("C-c e p" . eat-project)
- ("C-c e t" . eat)))
-
- (use-package f :demand t)
-
- (use-package envrc
- :commands envrc-global-mode
- :hook
- (after-init . envrc-global-mode))
-
- (use-package gptel
- :commands gptel-make-anthropic f-read-text
- :config
- (gptel-make-anthropic "Claude"
- :stream t :key (f-read-text "/run/secrets/claude_key")))
-
- (use-package sideline-flymake)
- (use-package sideline-eglot)
- (use-package sideline
- :custom
- (sideline-backends-right '(sideline-flymake sideline-eglot))
- :hook
- (eglot-managed-mode . sideline-mode)
- (flymake-mode . sideline-mode))
-
- (use-package eglot
- :custom
- (eglot-extend-to-xref t)
- (eglot-ignored-server-capabilities '(:inlayHintProvider))
- (jsonrpc-event-hook nil)
- :hook
- (eglot-managed-mode . eldoc-box-hover-mode)
- (before-save . eldoc-format-buffer)
- :bind
- (:map eglot-mode-map
- ("C-c l a" . eglot-code-actions)
- ("C-c l r" . eglot-rename)
- ("C-c l h" . eldoc)
- ("C-c l g" . xref-find-references)
- ("C-c l w" . eglot-reconnect)))
-
- (use-package proced
- :custom
- (proced-auto-update-flag t)
- (proced-auto-update-interval 3)
- (proced-enable-color-flag t)
- (proced-show-remote-processes t))
-
- (use-package org
- :ensure t
- :defer t
- :commands (org-mode org-capture org-agenda)
- :init
- (defvar org-journal-file "~/nextcloud/org/journal.org")
- (defvar org-archive-file "~/nextcloud/org/archive.org")
- (defvar org-notes-file "~/nextcloud/org/notes.org")
- (defvar org-inbox-file "~/nextcloud/org/inbox.org")
- (defvar org-work-file "~/nextcloud/org/work.org")
- (defun my/org-capture-project-target-heading ()
- "Determine Org target headings from the current file's project path.
-
- This function assumes a directory structure like '~/projects/COMPANY/PROJECT/'.
- It extracts 'COMPANY' and 'PROJECT' to use as nested headlines
- for an Org capture template.
-
- If the current buffer is not visi
- ting a file within such a
- project structure, it returns nil, causing capture to default to
- the top of the file."
- (when-let* ((path (buffer-file-name))) ; Ensure we are in a file-visiting buffer
- (let ((path-parts (split-string path "/" t " ")))
- (when-let* ((projects-pos (cl-position "projects" path-parts :test #'string=))
- (company (nth (+ 1 projects-pos) path-parts))
- (project (nth (+ 2 projects-pos) path-parts)))
- ;; Return a list of headlines for Org to find or create.
- (list company project)))))
- :bind
- (("C-c c" . org-capture)
- ("C-c i" . org-store-link)
- ("C-c a" . org-agenda)
- :map org-mode-map
- ("C-c t" . org-toggle-inline-images)
- ("C-c l" . org-toggle-link-display))
- :custom
- (org-agenda-files (list org-inbox-file org-journal-file))
- (org-directory "~/nextcloud/org")
- (org-default-notes-file org-inbox-file)
- (org-archive-location (concat org-archive-file "::* From %s"))
- (org-log-done 'time)
- (org-log-into-drawer t)
- (org-hide-emphasis-markers t)
- (org-src-fontify-natively t)
- (org-src-tab-acts-natively t)
- (org-capture-templates '(("t" "Todo" entry (file org-inbox-file)
- "* TODO %?\n:PROPERTIES:\n:CREATED: %U\n:END:\n\n%a\n\n)")
- ("j" "Journal" entry (file+olp+datetree org-journal-file)
- "* %?\n:PROPERTIES:\n:CREATED: %U\n:END:\n\n%a\n\n")
- ("n" "Note" entry (file org-notes-file)
- "* %?\n:PROPERTIES:\n:CREATED: %U\n:END:\n\n%a\n\n")
- ("p" "Project Task" item
- (file+function org-work-file my/org-capture-project-target-heading)
- "* TODO %? \n CLOCK: %U"
- ))
- )
- :config
- ;; Enable syntax highlighting in code blocks
- (add-hook 'org-mode-hook 'turn-on-font-lock)
- (add-hook 'org-mode-hook 'org-indent-mode))
-
- ;; extras
- (use-package comp-run
- :ensure nil
- :config
- (push "tramp-loaddefs.el.gz" native-comp-jit-compilation-deny-list)
- (push "cl-loaddefs.el.gz" native-comp-jit-compilation-deny-list))
-
- (use-package rustic
- :custom
- (rustic-lsp-client 'eglot))
-
- (provide 'init)
-
- ;;; init.el ends here
- #+end_src
-
-* Machines
-Only a few more things left. Specifically the machine level extra settings.
-** Smallbox
-The configuration for the laptop does not change much. Most changes are because the hardware is different.
-*** System Level
-Nothing specific for the laptop.
-
-#+begin_src nix :tangle machines/traveldroid/configuration.nix :noweb tangle :mkdirp yes
- { user, ... } : {
- imports =
- [
- ./hardware-configuration.nix
- ../../configuration
- ];
-
- <>
- }
-#+end_src
-
-*** Hardware
-This is the most different. Mostly taken from hardware-configuration.nix setup at first install.
-
-#+begin_src nix :tangle machines/traveldroid/hardware-configuration.nix :noweb tangle :mkdirp yes
- {
- hostname,
- pkgs,
- lib,
- modulesPath,
- user,
- config,
- ...
- }:
- {
- imports = [
- (modulesPath + "/installer/scan/not-detected.nix")
- ../../hardware/hardware.nix
- ];
-
- boot.initrd.availableKernelModules = [ "xhci_pci" "nvme" "usb_storage" "sd_mod" "rtsx_usb_sdmmc" ];
- boot.initrd.kernelModules = [ ];
- boot.kernelModules = [ "kvm-intel" ];
- boot.extraModulePackages = [ ];
-
- fileSystems."/" =
- { device = "/dev/disk/by-uuid/69433a14-fbaf-401b-af85-cd1bbf02b4e2";
- fsType = "ext4";
- };
-
- fileSystems."/boot" =
- { device = "/dev/disk/by-uuid/811D-0676";
- fsType = "vfat";
- options = [ "fmask=0077" "dmask=0077" ];
- };
-
- swapDevices =
- [ { device = "/dev/disk/by-uuid/b6c557c2-7682-460b-a5e7-8f6f2f429a3a"; }
- ];
-
- nixpkgs.hostPlatform = lib.mkDefault "x86_64-linux";
- hardware.cpu.intel.updateMicrocode = lib.mkDefault config.hardware.enableRedistributableFirmware;
- }
-#+end_src
-
-*** Home
-This is mostly about configuring the monitor and key bindings. And laptop specific utilities.
-#+begin_src nix :tangle machines/traveldroid/home.nix :noweb tangle :mkdirp yes
- { pkgs, ... } : {
- imports = [
- ../../home
- ];
-
- home.packages = with pkgs; [
- brightnessctl
- ];
-
- wayland.windowManager.hyprland.settings = {
- bind = [
- "XF86MonBrightnessUp, exec, brightnessctl set 5%+"
- "XF86MonBrightnessDown, exec, brightnessctl set 5%-"
- "XF86AudioRaiseVolume, exec, wpctl set-volume @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"
- ];
-
- bindl = [
- '', switch:on:Lid Switch, exec, hyprctl keyword monitor "eDP-1, disable"''
- '', switch:off:Lid Switch, exec, hyprctl keyword monitor "eDP-1, preferred, 0x0, 1"''
- ];
- };
- }
-#+end_src
-
-*** Secrets
-#+name: traveldroid-secrets
- #+begin_src nix
-# sops.secrets."ssh/traveldroid/private" = { # ssh private key
-# owner = "${user.username}";
-# mode = "600";
-# path = "/home/${user.username}/.ssh/id_ed25519";
-# };
-# sops.secrets."ssh/traveldroid/public" = { # ssh public key
-# owner = "${user.username}";
-# mode = "644";
-# path = "/home/${user.username}/.ssh/id_ed25519.pub";
-# };
-# sops.secrets."ssh/wavefunk/private" = { # ssh private key
-# owner = "${user.username}";
-# mode = "600";
-# path = "/home/${user.username}/.ssh/wavefunk";
-# };
-# sops.secrets."ssh/wavefunk/public" = { # ssh public key
-# owner = "${user.username}";
-# mode = "644";
-# path = "/home/${user.username}/.ssh/wavefunk.pub";
-# };
-# sops.secrets."ssh/wavefunk_dev/private" = { # ssh private key
-# owner = "${user.username}";
-# mode = "600";
-# path = "/home/${user.username}/.ssh/wavefunk_dev";
-# };
-# sops.secrets."ssh/wavefunk_dev/public" = { # ssh public key
-# owner = "${user.username}";
-# mode = "644";
-# path = "/home/${user.username}/.ssh/wavefunk_dev.pub";
-# };
-
- programs._1password.enable = true;
- programs._1password-gui = {
- enable = true;
- polkitPolicyOwners = [ "${user.username}" ];
- };
-#+end_src
-* README Utils
-*** Headers
-This script adds a =DO NOT MODIFY= header to all the generated nix files.
-#+NAME: startup
-#+BEGIN_SRC emacs-lisp
- (progn
- (defun add-tangle-headers ()
- (message "running in %s" (buffer-file-name))
- (when (string= (file-name-extension (buffer-file-name)) "nix")
- (goto-char (point-min))
- (insert "# WARNING : This file was generated by README.org\n# DO NOT MODIFY THIS FILE!\n# Any changes made here will be overwritten.\n")
- (save-buffer))
- (save-buffer))
- (add-hook 'org-babel-post-tangle-hook 'add-tangle-headers))
-#+END_SRC
-
-# Local Variables:
-# org-confirm-babel-evaluate: nil
-# eval: (progn (org-babel-goto-named-src-block "startup") (org-babel-execute-src-block) (outline-hide-sublevels 1))
-# End:
diff --git a/OLD CONFIGS/system-master_BAK/assets/background.png b/OLD CONFIGS/system-master_BAK/assets/background.png
deleted file mode 100755
index 5cdb0af64..000000000
Binary files a/OLD CONFIGS/system-master_BAK/assets/background.png and /dev/null differ
diff --git a/OLD CONFIGS/system-master_BAK/assets/conf/apps/#packages.conf# b/OLD CONFIGS/system-master_BAK/assets/conf/apps/#packages.conf#
deleted file mode 100644
index 9d451f821..000000000
--- a/OLD CONFIGS/system-master_BAK/assets/conf/apps/#packages.conf#
+++ /dev/null
@@ -1,72 +0,0 @@
-# IMPORTANT:
-# Only packages/attributes that exist in Nixpkgs can be installed.
-# Check names on https://search.nixos.org/packages
-# A wrong package name (or attribute path) will cause the Nix build to fail.
-
-
-# system
-waybar
-wofi
-dunst
-xdg-utils
-desktop-file-utils
-playerctl
-pamixer
-brightnessctl
-rofi
-home-manager
-
-# browsers
-brave
-vivaldi
-chromium
-
-# hyprland
-hyprpaper
-
-# utils
-wget
-flatpak
-nextcloud-client
-kdePackages.okular
-kdePackages.gwenview
-kdePackages.kdeconnect-kde
-_1password-gui
-
-docker
-tree
-ripgrep
-gparted
-file
-htop
-wev
-solaar
-
-# terminal
-kitty
-starship
-kdePackages.konsole
-kdePackages.yakuake
-
-# office
-obsidian
-onlyoffice-desktopeditors
-
-# development
-git
-vscode-with-extensions
-kdePackages.kate
-jetbrains.pycharm
-python3
-
-# communication
-nextcloud-talk-desktop
-signal-desktop
-
-# multimedia
-spotify
-vlc
-
-# graphic
-gimp2
-
diff --git a/OLD CONFIGS/system-master_BAK/assets/conf/apps/flatpak.conf b/OLD CONFIGS/system-master_BAK/assets/conf/apps/flatpak.conf
deleted file mode 100644
index 0bb3cadcf..000000000
--- a/OLD CONFIGS/system-master_BAK/assets/conf/apps/flatpak.conf
+++ /dev/null
@@ -1,4 +0,0 @@
-app.zen_browser.zen
-com.github.tchx84.Flatseal
-eu.betterbird.Betterbird
-com.todoist.Todoist
diff --git a/OLD CONFIGS/system-master_BAK/assets/conf/apps/packages.conf b/OLD CONFIGS/system-master_BAK/assets/conf/apps/packages.conf
deleted file mode 100644
index 1f29ec41e..000000000
--- a/OLD CONFIGS/system-master_BAK/assets/conf/apps/packages.conf
+++ /dev/null
@@ -1,68 +0,0 @@
-# IMPORTANT:
-# Only packages/attributes that exist in Nixpkgs can be installed.
-# Check names on https://search.nixos.org/packages
-# A wrong package name (or attribute path) will cause the Nix build to fail.
-
-
-# system
-waybar
-wofi
-dunst
-xdg-utils
-desktop-file-utils
-playerctl
-pamixer
-brightnessctl
-rofi
-home-manager
-
-# browsers
-brave
-vivaldi
-chromium
-
-# hyprland
-hyprpaper
-
-# utils
-wget
-flatpak
-nextcloud-client
-kdePackages.okular
-kdePackages.gwenview
-kdePackages.kdeconnect-kde
-_1password-gui
-docker
-tree
-ripgrep
-gparted
-file
-htop
-wev
-solaar
-
-# terminal
-kitty
-starship
-kdePackages.konsole
-kdePackages.yakuake
-
-# office
-obsidian
-onlyoffice-desktopeditors
-
-# development
-git
-vscode-with-extensions
-kdePackages.kate
-#jetbrains.pycharm
-python3
-
-# communication
-nextcloud-talk-desktop
-signal-desktop
-
-# multimedia
-spotify
-vlc
-
diff --git a/OLD CONFIGS/system-master_BAK/assets/conf/greeter/greeter.conf b/OLD CONFIGS/system-master_BAK/assets/conf/greeter/greeter.conf
deleted file mode 100644
index 3e35cd370..000000000
--- a/OLD CONFIGS/system-master_BAK/assets/conf/greeter/greeter.conf
+++ /dev/null
@@ -1,11 +0,0 @@
- # Minimal Hyprland config for greetd
-
-monitor = , preferred, auto, 1
-
-misc {
- disable_hyprland_logo = true
- disable_splash_rendering = true
-}
-
-# Start qtgreet and point it at the correct session paths for NixOS
-exec-once = sh -lc 'source /etc/greetd/qtgreet-session-paths; exec qtgreet -w "$WAYLAND_SESSIONS" -x "$X11_SESSIONS"'
diff --git a/OLD CONFIGS/system-master_BAK/assets/conf/hypr/bindings.conf b/OLD CONFIGS/system-master_BAK/assets/conf/hypr/bindings.conf
deleted file mode 100644
index 337cd0e31..000000000
--- a/OLD CONFIGS/system-master_BAK/assets/conf/hypr/bindings.conf
+++ /dev/null
@@ -1,122 +0,0 @@
-###############
-# Keybindings #
-###############
-
-$mod = SUPER
-
-# Terminal / launcher / kill / reload
-bind = $mod, RETURN, exec, kitty
-bind = $mod, D, exec, wofi --show drun
-bind = $mod, Q, killactive,
-bind = $mod SHIFT, Q, exit,
-bind = $mod SHIFT, R, exec, hyprctl reload
-
-# Default browser
-bind = $mod, W, exec, xdg-open https://about:blank
-# Focus movement
-bind = $mod, H, movefocus, l
-bind = $mod, L, movefocus, r
-bind = $mod, K, movefocus, u
-bind = $mod, J, movefocus, d
-bind = $mod, left, movefocus, l
-bind = $mod, right, movefocus, r
-bind = $mod, up, movefocus, u
-bind = $mod, down, movefocus, d
-
-# Move windows
-bind = $mod SHIFT, H, movewindow, l
-bind = $mod SHIFT, L, movewindow, r
-bind = $mod SHIFT, K, movewindow, u
-bind = $mod SHIFT, J, movewindow, d
-bind = $mod SHIFT, left, movewindow, l
-bind = $mod SHIFT, right, movewindow, r
-bind = $mod SHIFT, up, movewindow, u
-bind = $mod SHIFT, down, movewindow, d
-
-# Resize windows
-bind = $mod CTRL, H, resizeactive, -30 0
-bind = $mod CTRL, L, resizeactive, 30 0
-bind = $mod CTRL, K, resizeactive, 0 -30
-bind = $mod CTRL, J, resizeactive, 0 30
-
-# Floating / fullscreen
-bind = $mod, V, togglefloating,
-bind = $mod, F, fullscreen, 0
-bind = $mod SHIFT, F, fullscreen, 1
-
-# Workspaces
-bind = $mod, 1, workspace, 1
-bind = $mod, 2, workspace, 2
-bind = $mod, 3, workspace, 3
-bind = $mod, 4, workspace, 4
-bind = $mod, 5, workspace, 5
-bind = $mod, 6, workspace, 6
-bind = $mod, 7, workspace, 7
-bind = $mod, 8, workspace, 8
-bind = $mod, 9, workspace, 9
-bind = $mod, 0, workspace, 10
-
-bind = $mod SHIFT, 1, movetoworkspace, 1
-bind = $mod SHIFT, 2, movetoworkspace, 2
-bind = $mod SHIFT, 3, movetoworkspace, 3
-bind = $mod SHIFT, 4, movetoworkspace, 4
-bind = $mod SHIFT, 5, movetoworkspace, 5
-bind = $mod SHIFT, 6, movetoworkspace, 6
-bind = $mod SHIFT, 7, movetoworkspace, 7
-bind = $mod SHIFT, 8, movetoworkspace, 8
-bind = $mod SHIFT, 9, movetoworkspace, 9
-bind = $mod SHIFT, 0, movetoworkspace, 10
-
-# Cycle workspaces
-bind = $mod, mouse_down, workspace, e+1
-bind = $mod, mouse_up, workspace, e-1
-
-# Mouse drag
-bindm = $mod, mouse:272, movewindow
-bindm = $mod, mouse:273, resizewindow
-
-#########################
-# Screenshots
-#########################
-bind = $mod SHIFT, s, exec, grim -g "$(slurp)" - | wl-copy
-bind = , XF86Screenshot, exec, grim - | wl-copy
-
-#########################
-# Audio (pamixer)
-#########################
-bind = , XF86AudioRaiseVolume, exec, pamixer -i 5
-bind = , XF86AudioLowerVolume, exec, pamixer -d 5
-bind = , XF86AudioMute, exec, pamixer -t
-bind = , XF86AudioMicMute, exec, pamixer --default-source -t
-
-#########################
-# Media (playerctl)
-#########################
-bind = , XF86AudioPlay, exec, playerctl play-pause
-bind = , XF86AudioPause, exec, playerctl pause
-bind = , XF86AudioNext, exec, playerctl next
-bind = , XF86AudioPrev, exec, playerctl previous
-bind = , XF86AudioStop, exec, playerctl stop
-
-#########################
-# Brightness (brightnessctl)
-#########################
-bind = , XF86MonBrightnessUp, exec, brightnessctl set +10%
-bind = , XF86MonBrightnessDown, exec, brightnessctl set 10%-
-bind = , XF86KbdBrightnessUp, exec, brightnessctl -d '*kbd_backlight*' set +10%
-bind = , XF86KbdBrightnessDown, exec, brightnessctl -d '*kbd_backlight*' set 10%-
-
-#########################
-# Power / session
-#########################
-bind = , XF86Sleep, exec, systemctl suspend
-bind = , XF86PowerOff, exec, systemctl poweroff
-bind = , XF86WakeUp, exec, systemctl suspend
-
-#########################
-# Start apps
-#########################
-bind = $mod, E, exec, dolphin
-bind = CTRLALT, B, exec, flatpak run eu.betterbird.Betterbird
-bind = CTRLALT, S, exec, spotify
-bind = CTRLALT, z, exec, flatpak run app.zen_browser.zen
diff --git a/OLD CONFIGS/system-master_BAK/assets/conf/hypr/hyprland.conf b/OLD CONFIGS/system-master_BAK/assets/conf/hypr/hyprland.conf
deleted file mode 100644
index a663e74d9..000000000
--- a/OLD CONFIGS/system-master_BAK/assets/conf/hypr/hyprland.conf
+++ /dev/null
@@ -1,58 +0,0 @@
-
-# --- Variables ---
-$mod = SUPER
-$term = kitty
-$menu = hyprshell run
-
-
-# --- Environment ---
-env = XDG_CURRENT_DESKTOP,Hyprland
-env = XDG_SESSION_TYPE,wayland
-env = XDG_SESSION_DESKTOP,Hyprland
-env = MOZ_ENABLE_WAYLAND,1
-
-# --- Monitor (safe default) ---
-monitor = , preferred, auto, 1
-
-# --- Input ---
-input {
- kb_layout = us
- follow_mouse = 1
- touchpad {
- natural_scroll = true
- }
-}
-
-# --- General ---
-general {
- gaps_in = 5
- gaps_out = 10
- border_size = 2
- layout = dwindle
-}
-
-animations {
- enabled = true
-}
-
-decoration {
- blur {
- enabled = true
- size = 8
- passes = 2
- new_optimizations = true
- }
-}
-
-misc {
- disable_hyprland_logo = false
- disable_splash_rendering = false
-}
-
-# --- Keybindings live here ---
-source = /etc/xdg/hypr/bindings.conf
-
-
-# --- Autostart ---
-exec-once = waybar
-#exec-once = sleep 2 & /run/current-system/sw/bin/hyprshell run
diff --git a/OLD CONFIGS/system-master_BAK/assets/conf/hypr/hyprland_no_blur.conf b/OLD CONFIGS/system-master_BAK/assets/conf/hypr/hyprland_no_blur.conf
deleted file mode 100644
index 1c0f79468..000000000
--- a/OLD CONFIGS/system-master_BAK/assets/conf/hypr/hyprland_no_blur.conf
+++ /dev/null
@@ -1,61 +0,0 @@
-# =========================
-# Hyprland config (generated by Nix)
-# =========================
-
-# --- Variables ---
-$mod = SUPER
-$term = kitty
-$menu = hyprshell run
-
-
-# --- Environment ---
-env = XDG_CURRENT_DESKTOP,Hyprland
-env = XDG_SESSION_TYPE,wayland
-env = XDG_SESSION_DESKTOP,Hyprland
-env = MOZ_ENABLE_WAYLAND,1
-
-# --- Monitor (safe default) ---
-monitor = , preferred, auto, 1
-
-# --- Input ---
-input {
- kb_layout = us
- follow_mouse = 1
- touchpad {
- natural_scroll = true
- }
-}
-
-# --- General ---
-general {
- gaps_in = 5
- gaps_out = 10
- border_size = 2
- layout = dwindle
-}
-
-animations {
- enabled = true
-}
-
-decoration {
- blur {
- enabled = false
- size = 8
- passes = 2
- new_optimizations = true
- }
-}
-
-misc {
- disable_hyprland_logo = false
- disable_splash_rendering = false
-}
-
-# --- Keybindings live here ---
-source = /etc/xdg/hypr/bindings.conf
-
-
-# --- Autostart ---
-exec-once = waybar
-#exec-once = sleep 2 & /run/current-system/sw/bin/hyprshell run
diff --git a/OLD CONFIGS/system-master_BAK/assets/conf/hypr/hyprshell.conf b/OLD CONFIGS/system-master_BAK/assets/conf/hypr/hyprshell.conf
deleted file mode 100644
index e69de29bb..000000000
diff --git a/OLD CONFIGS/system-master_BAK/assets/conf/ssh/ssh-client.conf b/OLD CONFIGS/system-master_BAK/assets/conf/ssh/ssh-client.conf
deleted file mode 100644
index 145ff870c..000000000
--- a/OLD CONFIGS/system-master_BAK/assets/conf/ssh/ssh-client.conf
+++ /dev/null
@@ -1,4 +0,0 @@
-Host *
- AddKeysToAgent yes
- ServerAliveInterval 30
- ServerAliveCountMax 3
diff --git a/OLD CONFIGS/system-master_BAK/assets/conf/terminal/aliases.conf b/OLD CONFIGS/system-master_BAK/assets/conf/terminal/aliases.conf
deleted file mode 100644
index fe8178599..000000000
--- a/OLD CONFIGS/system-master_BAK/assets/conf/terminal/aliases.conf
+++ /dev/null
@@ -1,17 +0,0 @@
-alias ll='ls -lah'
-alias gs='git status'
-alias ga='git add'
-alias gc='git commit'
-alias reb-switch='cd ~/nixos && sudo nixos-rebuild switch --flake ~/nixos#traveldroid'
-alias reb-test='cd ~/nixos && sudo nixos-rebuild test --flake ~/nixos#traveldroid'
-alias reb-vm='cd ~/nixos && sudo nixos-rebuild build-vm --flake ~/nixos#traveldroid && "$(ls -1 ./result/bin/run-*-vm | head -n 1)"'
-alias rb='systemctl reboot'
-alias po='systemctl poweroff'
-alias fpl='flatpak search'
-alias fpi='flatpak install'
-alias fpr='flatpak run'
-alias nxc='ssh henrov@nextcloud.data-pro.nu'
-alias nps='xdg-open https://search.nixos.org'
-alias vs='code'
-alias saveme='sudo nix-env -p /nix/var/nix/profiles/system --set /nix/var/nix/profiles/system-123-link && sudo /nix/var/nix/profiles/system/bin/switch-to-configuration boot'
-
diff --git a/OLD CONFIGS/system-master_BAK/assets/conf/terminal/kitty.conf b/OLD CONFIGS/system-master_BAK/assets/conf/terminal/kitty.conf
deleted file mode 100644
index c0f325bae..000000000
--- a/OLD CONFIGS/system-master_BAK/assets/conf/terminal/kitty.conf
+++ /dev/null
@@ -1,12 +0,0 @@
-# ~/nixos/files/conf/terminal/kitty.conf
-# Kitty config (https://sw.kovidgoyal.net/kitty/conf/)
-#
-# Edit freely; NixOS will inject this file verbatim via programs.kitty.extraConfig.
-
-# Example baseline settings:
-background_opacity 0.60
-dynamic_background_opacity yes
-
-# Suggested: allow ctrl+shift+v paste (many distros default this already)
-map ctrl+shift+v paste_from_clipboard
-map ctrl+shift+c copy_to_clipboard
diff --git a/OLD CONFIGS/system-master_BAK/assets/conf/terminal/starship.toml b/OLD CONFIGS/system-master_BAK/assets/conf/terminal/starship.toml
deleted file mode 100644
index ba9bd82ab..000000000
--- a/OLD CONFIGS/system-master_BAK/assets/conf/terminal/starship.toml
+++ /dev/null
@@ -1,279 +0,0 @@
-"$schema" = 'https://starship.rs/config-schema.json'
-
-format = """
-[](red)\
-$os\
-$username\
-[](bg:peach fg:red)\
-$directory\
-[](bg:yellow fg:peach)\
-$git_branch\
-$git_status\
-[](fg:yellow bg:green)\
-$c\
-$rust\
-$golang\
-$nodejs\
-$php\
-$java\
-$kotlin\
-$haskell\
-$python\
-[](fg:green bg:sapphire)\
-$conda\
-[](fg:sapphire bg:lavender)\
-$time\
-[ ](fg:lavender)\
-$cmd_duration\
-$line_break\
-$character"""
-
-palette = 'catppuccin_mocha'
-
-[os]
-disabled = false
-style = "bg:red fg:crust"
-
-[os.symbols]
-Windows = ""
-Ubuntu = ""
-SUSE = ""
-Raspbian = ""
-Mint = ""
-Macos = ""
-Manjaro = ""
-Linux = ""
-Gentoo = ""
-Fedora = ""
-Alpine = ""
-Amazon = ""
-Android = ""
-AOSC = ""
-Arch = ""
-Artix = ""
-CentOS = ""
-Debian = ""
-Redhat = ""
-RedHatEnterprise = ""
-
-[username]
-show_always = true
-style_user = "bg:red fg:crust"
-style_root = "bg:red fg:crust"
-format = '[ $user]($style)'
-
-[directory]
-style = "bg:peach fg:crust"
-format = "[ $path ]($style)"
-truncation_length = 3
-truncation_symbol = "…/"
-
-[directory.substitutions]
-"Documents" = " "
-"Downloads" = " "
-"Music" = " "
-"Pictures" = " "
-"Developer" = " "
-
-[git_branch]
-symbol = ""
-style = "bg:yellow"
-format = '[[ $symbol $branch ](fg:crust bg:yellow)]($style)'
-
-[git_status]
-style = "bg:yellow"
-format = '[[($all_status$ahead_behind )](fg:crust bg:yellow)]($style)'
-
-[nodejs]
-symbol = ""
-style = "bg:green"
-format = '[[ $symbol( $version) ](fg:crust bg:green)]($style)'
-
-[c]
-symbol = " "
-style = "bg:green"
-format = '[[ $symbol( $version) ](fg:crust bg:green)]($style)'
-
-[rust]
-symbol = ""
-style = "bg:green"
-format = '[[ $symbol( $version) ](fg:crust bg:green)]($style)'
-
-[golang]
-symbol = ""
-style = "bg:green"
-format = '[[ $symbol( $version) ](fg:crust bg:green)]($style)'
-
-[php]
-symbol = ""
-style = "bg:green"
-format = '[[ $symbol( $version) ](fg:crust bg:green)]($style)'
-
-[java]
-symbol = " "
-style = "bg:green"
-format = '[[ $symbol( $version) ](fg:crust bg:green)]($style)'
-
-[kotlin]
-symbol = ""
-style = "bg:green"
-format = '[[ $symbol( $version) ](fg:crust bg:green)]($style)'
-
-[haskell]
-symbol = ""
-style = "bg:green"
-format = '[[ $symbol( $version) ](fg:crust bg:green)]($style)'
-
-[python]
-symbol = ""
-style = "bg:green"
-format = '[[ $symbol( $version)(\(#$virtualenv\)) ](fg:crust bg:green)]($style)'
-
-[docker_context]
-symbol = ""
-style = "bg:sapphire"
-format = '[[ $symbol( $context) ](fg:crust bg:sapphire)]($style)'
-
-[conda]
-symbol = " "
-style = "fg:crust bg:sapphire"
-format = '[$symbol$environment ]($style)'
-ignore_base = false
-
-[time]
-disabled = false
-time_format = "%R"
-style = "bg:lavender"
-format = '[[ $time ](fg:crust bg:lavender)]($style)'
-
-[line_break]
-disabled = false
-
-[character]
-disabled = false
-success_symbol = '[❯](bold fg:green)'
-error_symbol = '[❯](bold fg:red)'
-vimcmd_symbol = '[❮](bold fg:green)'
-vimcmd_replace_one_symbol = '[❮](bold fg:lavender)'
-vimcmd_replace_symbol = '[❮](bold fg:lavender)'
-vimcmd_visual_symbol = '[❮](bold fg:yellow)'
-
-[cmd_duration]
-show_milliseconds = true
-format = " in $duration "
-style = "bg:lavender"
-disabled = false
-show_notifications = true
-min_time_to_notify = 45000
-
-[palettes.catppuccin_mocha]
-rosewater = "#f5e0dc"
-flamingo = "#f2cdcd"
-pink = "#f5c2e7"
-mauve = "#cba6f7"
-red = "#f38ba8"
-maroon = "#eba0ac"
-peach = "#fab387"
-yellow = "#f9e2af"
-green = "#a6e3a1"
-teal = "#94e2d5"
-sky = "#89dceb"
-sapphire = "#74c7ec"
-blue = "#89b4fa"
-lavender = "#b4befe"
-text = "#cdd6f4"
-subtext1 = "#bac2de"
-subtext0 = "#a6adc8"
-overlay2 = "#9399b2"
-overlay1 = "#7f849c"
-overlay0 = "#6c7086"
-surface2 = "#585b70"
-surface1 = "#45475a"
-surface0 = "#313244"
-base = "#1e1e2e"
-mantle = "#181825"
-crust = "#11111b"
-
-[palettes.catppuccin_frappe]
-rosewater = "#f2d5cf"
-flamingo = "#eebebe"
-pink = "#f4b8e4"
-mauve = "#ca9ee6"
-red = "#e78284"
-maroon = "#ea999c"
-peach = "#ef9f76"
-yellow = "#e5c890"
-green = "#a6d189"
-teal = "#81c8be"
-sky = "#99d1db"
-sapphire = "#85c1dc"
-blue = "#8caaee"
-lavender = "#babbf1"
-text = "#c6d0f5"
-subtext1 = "#b5bfe2"
-subtext0 = "#a5adce"
-overlay2 = "#949cbb"
-overlay1 = "#838ba7"
-overlay0 = "#737994"
-surface2 = "#626880"
-surface1 = "#51576d"
-surface0 = "#414559"
-base = "#303446"
-mantle = "#292c3c"
-crust = "#232634"
-
-[palettes.catppuccin_latte]
-rosewater = "#dc8a78"
-flamingo = "#dd7878"
-pink = "#ea76cb"
-mauve = "#8839ef"
-red = "#d20f39"
-maroon = "#e64553"
-peach = "#fe640b"
-yellow = "#df8e1d"
-green = "#40a02b"
-teal = "#179299"
-sky = "#04a5e5"
-sapphire = "#209fb5"
-blue = "#1e66f5"
-lavender = "#7287fd"
-text = "#4c4f69"
-subtext1 = "#5c5f77"
-subtext0 = "#6c6f85"
-overlay2 = "#7c7f93"
-overlay1 = "#8c8fa1"
-overlay0 = "#9ca0b0"
-surface2 = "#acb0be"
-surface1 = "#bcc0cc"
-surface0 = "#ccd0da"
-base = "#eff1f5"
-mantle = "#e6e9ef"
-crust = "#dce0e8"
-
-[palettes.catppuccin_macchiato]
-rosewater = "#f4dbd6"
-flamingo = "#f0c6c6"
-pink = "#f5bde6"
-mauve = "#c6a0f6"
-red = "#ed8796"
-maroon = "#ee99a0"
-peach = "#f5a97f"
-yellow = "#eed49f"
-green = "#a6da95"
-teal = "#8bd5ca"
-sky = "#91d7e3"
-sapphire = "#7dc4e4"
-blue = "#8aadf4"
-lavender = "#b7bdf8"
-text = "#cad3f5"
-subtext1 = "#b8c0e0"
-subtext0 = "#a5adcb"
-overlay2 = "#939ab7"
-overlay1 = "#8087a2"
-overlay0 = "#6e738d"
-surface2 = "#5b6078"
-surface1 = "#494d64"
-surface0 = "#363a4f"
-base = "#24273a"
-mantle = "#1e2030"
-crust = "#181926"
diff --git a/OLD CONFIGS/system-master_BAK/assets/conf/terminal/zsh.conf b/OLD CONFIGS/system-master_BAK/assets/conf/terminal/zsh.conf
deleted file mode 100644
index 8a6da2744..000000000
--- a/OLD CONFIGS/system-master_BAK/assets/conf/terminal/zsh.conf
+++ /dev/null
@@ -1,14 +0,0 @@
-# ~/nixos/files/conf/terminal/zsh.conf
-# Additional zsh configuration sourced for every interactive zsh shell.
-# Keep this file POSIX-ish; it is sourced by zsh.
-
-# Example: history settings
-HISTFILE="$HOME/.zsh_history"
-HISTSIZE=10000
-SAVEHIST=10000
-
-setopt HIST_IGNORE_ALL_DUPS
-setopt SHARE_HISTORY
-
-# Example: enable starship if you ever disable the zsh integration module
-# eval "$(starship init zsh)"
diff --git a/OLD CONFIGS/system-master_BAK/assets/conf/wallpaper/wallpaper.conf b/OLD CONFIGS/system-master_BAK/assets/conf/wallpaper/wallpaper.conf
deleted file mode 100644
index 2a7730a55..000000000
--- a/OLD CONFIGS/system-master_BAK/assets/conf/wallpaper/wallpaper.conf
+++ /dev/null
@@ -1,8 +0,0 @@
-# transition type: fade, wipe, simple, any, etc.
-TRANSITION_TYPE=fade
-# duration in seconds (can be decimal)
-TRANSITION_DURATION=2
-# frames per second
-TRANSITION_FPS=60
-# override source dir if you ever move it
-# SRC_DIR=~/nixos/files/wallpapers/picture
diff --git a/OLD CONFIGS/system-master_BAK/assets/conf/waybar/config.jsonc b/OLD CONFIGS/system-master_BAK/assets/conf/waybar/config.jsonc
deleted file mode 100644
index e69de29bb..000000000
diff --git a/OLD CONFIGS/system-master_BAK/assets/conf/waybar/style.css b/OLD CONFIGS/system-master_BAK/assets/conf/waybar/style.css
deleted file mode 100644
index e69de29bb..000000000
diff --git a/OLD CONFIGS/system-master_BAK/assets/conf/xdg/mimeapps.list b/OLD CONFIGS/system-master_BAK/assets/conf/xdg/mimeapps.list
deleted file mode 100644
index e69de29bb..000000000
diff --git a/OLD CONFIGS/system-master_BAK/assets/lock.png b/OLD CONFIGS/system-master_BAK/assets/lock.png
deleted file mode 100755
index 46eb4a70c..000000000
Binary files a/OLD CONFIGS/system-master_BAK/assets/lock.png and /dev/null differ
diff --git a/OLD CONFIGS/system-master_BAK/assets/wallpaper/picture/pexels-kseniachernaya-5691695.jpg b/OLD CONFIGS/system-master_BAK/assets/wallpaper/picture/pexels-kseniachernaya-5691695.jpg
deleted file mode 100644
index 5f5268652..000000000
Binary files a/OLD CONFIGS/system-master_BAK/assets/wallpaper/picture/pexels-kseniachernaya-5691695.jpg and /dev/null differ
diff --git a/OLD CONFIGS/system-master_BAK/assets/wallpaper/picture/pexels-lalesh-147635.jpg b/OLD CONFIGS/system-master_BAK/assets/wallpaper/picture/pexels-lalesh-147635.jpg
deleted file mode 100644
index 1acd099e2..000000000
Binary files a/OLD CONFIGS/system-master_BAK/assets/wallpaper/picture/pexels-lalesh-147635.jpg and /dev/null differ
diff --git a/OLD CONFIGS/system-master_BAK/assets/wallpaper/picture/pexels-lucaspezeta-2212858.jpg b/OLD CONFIGS/system-master_BAK/assets/wallpaper/picture/pexels-lucaspezeta-2212858.jpg
deleted file mode 100644
index e3008f04b..000000000
Binary files a/OLD CONFIGS/system-master_BAK/assets/wallpaper/picture/pexels-lucaspezeta-2212858.jpg and /dev/null differ
diff --git a/OLD CONFIGS/system-master_BAK/assets/wallpaper/picture/pexels-themob000-28428584.jpg b/OLD CONFIGS/system-master_BAK/assets/wallpaper/picture/pexels-themob000-28428584.jpg
deleted file mode 100644
index c304de4b8..000000000
Binary files a/OLD CONFIGS/system-master_BAK/assets/wallpaper/picture/pexels-themob000-28428584.jpg and /dev/null differ
diff --git a/OLD CONFIGS/system-master_BAK/assets/wallpaper/picture/pexels-themob000-28428592.jpg b/OLD CONFIGS/system-master_BAK/assets/wallpaper/picture/pexels-themob000-28428592.jpg
deleted file mode 100644
index ecf0dce30..000000000
Binary files a/OLD CONFIGS/system-master_BAK/assets/wallpaper/picture/pexels-themob000-28428592.jpg and /dev/null differ
diff --git a/OLD CONFIGS/system-master_BAK/assets/wallpaper/videos/dark_water_large.mp4 b/OLD CONFIGS/system-master_BAK/assets/wallpaper/videos/dark_water_large.mp4
deleted file mode 100644
index cf66295f4..000000000
Binary files a/OLD CONFIGS/system-master_BAK/assets/wallpaper/videos/dark_water_large.mp4 and /dev/null differ
diff --git a/OLD CONFIGS/system-master_BAK/assets/wallpaper/videos/white_blobs_small.mp4 b/OLD CONFIGS/system-master_BAK/assets/wallpaper/videos/white_blobs_small.mp4
deleted file mode 100644
index 0a4faaf8f..000000000
Binary files a/OLD CONFIGS/system-master_BAK/assets/wallpaper/videos/white_blobs_small.mp4 and /dev/null differ
diff --git a/OLD CONFIGS/system-master_BAK/configuration/audio.nix b/OLD CONFIGS/system-master_BAK/configuration/audio.nix
deleted file mode 100755
index 656ad5d5f..000000000
--- a/OLD CONFIGS/system-master_BAK/configuration/audio.nix
+++ /dev/null
@@ -1,14 +0,0 @@
-{ pkgs, ...}:
-{
- environment.systemPackages = with pkgs; [ pamixer ];
- services.pipewire = {
- enable = true;
- alsa.enable = true;
- alsa.support32Bit = true;
- pulse.enable = true;
- jack.enable = true;
- };
-
- # pipewire needs realtime scheduling access
- security.rtkit.enable = true;
-}
diff --git a/OLD CONFIGS/system-master_BAK/configuration/boot.nix b/OLD CONFIGS/system-master_BAK/configuration/boot.nix
deleted file mode 100755
index 3dc2cbf66..000000000
--- a/OLD CONFIGS/system-master_BAK/configuration/boot.nix
+++ /dev/null
@@ -1,27 +0,0 @@
-{ pkgs, ... } :
-{
- boot = {
- initrd = {
- verbose = false; # its a lot of logs. dont need it, unless we do.
- kernelModules = [ ]; # no kernel modules on boot
- };
-
- extraModulePackages = [ ]; # no extra packages on boot either
- kernelPackages = pkgs.linuxPackages_latest; # latest greatest linux kernel
- kernelParams = [ "silent" ]; # quiet those logs
-
- consoleLogLevel = 0; # quiten more logs
- plymouth.enable = true; # graphical boot animation instead
-
- supportedFilesystems = [ "ntfs" ]; # should see the ntfs (windows)
-
- loader = {
- systemd-boot.enable = true; # systemd-boot
- systemd-boot.configurationLimit = 2;
- efi.canTouchEfiVariables = true; # allow editing efi to edit the boot loader
-
-
- timeout = 5; # grub timeout to make a selection
- };
- };
-}
diff --git a/OLD CONFIGS/system-master_BAK/configuration/cli.nix b/OLD CONFIGS/system-master_BAK/configuration/cli.nix
deleted file mode 100755
index 305396743..000000000
--- a/OLD CONFIGS/system-master_BAK/configuration/cli.nix
+++ /dev/null
@@ -1,9 +0,0 @@
-{ pkgs, user, ... }:
-{
- console.useXkbConfig = true;
- users.users.${user.username}.shell = pkgs.zsh;
-
- environment.shells = with pkgs; [ zsh ];
- programs.zsh.enable = true;
- environment.pathsToLink = [ "/share/zsh" ];
-}
diff --git a/OLD CONFIGS/system-master_BAK/configuration/default.nix b/OLD CONFIGS/system-master_BAK/configuration/default.nix
deleted file mode 100755
index 23a412a29..000000000
--- a/OLD CONFIGS/system-master_BAK/configuration/default.nix
+++ /dev/null
@@ -1,80 +0,0 @@
-{ pkgs, user, ... } :
-{
- imports = [
- ./boot.nix
- ./login.nix
- ./cli.nix
- ./files.nix
- ./locale.nix
- ./nix-settings.nix
- ./networking.nix
- ./hyprland.nix
- ./services.nix
- ./audio.nix
- #./steam.nix
- #./sops.nix
- ./packages.nix
- ./flatpak.nix
- ];
-
- environment.systemPackages = with pkgs; [
- wget # fetch utility
- curl # more fetch utility
- binutils # executable utilities, like ld
- dmidecode # tool for dumping system info
- libnotify # notification daemon
- python3 # nice to have this ready for quick things
- cacert # certificate authority
- remmina # remote desktop app
- #rg # ripgrep
- wev # for finding keypresses
- tree # list foldetrtree's
- file # filinfo
- htop # sysmonitor
- solaar # logitech controller
- git # source control
- # jetbrains.pycharm # Dev and course environment
-
-
- ];
-
- # to enable icons with wlogout
- # https://github.com/catppuccin/nix/issues/584
- programs.gdk-pixbuf.modulePackages = [ pkgs.librsvg ];
-
- users.users.${user.username} = {
- isNormalUser = true;
- description = "henrov";
- extraGroups = [
- "networkmanager" # allow editing network connections
- "wheel" # can do sudo
- "scanner" # access to the network scanner
- "lp" # access to the printer
- ];
- };
-
- programs = {
- nix-ld.enable = true; # helps with linking troubles with dynamic libraries
- appimage.enable = true; # allow appimage installations
- dconf.enable = true; # to save user settings
- gnupg.agent = {
- # pgp client
- enable = true;
- enableSSHSupport = true;
- };
- firefox.enable = true; # browser
- wireshark.enable = true; # vpn
- };
-
- fonts.packages = with pkgs; [
- aporetic
- nerd-fonts.iosevka
- ];
-
- # enable the catppuccin theme for everything with mocha + blue accents
- catppuccin.enable = true;
- catppuccin.flavor = "mocha";
- catppuccin.accent = "blue";
-
- system.stateVersion = user.stateVersion;
-}
diff --git a/OLD CONFIGS/system-master_BAK/configuration/files.nix b/OLD CONFIGS/system-master_BAK/configuration/files.nix
deleted file mode 100755
index 5f8b99aeb..000000000
--- a/OLD CONFIGS/system-master_BAK/configuration/files.nix
+++ /dev/null
@@ -1,28 +0,0 @@
-{ pkgs, user, config, ... } :
-{
- environment.systemPackages = with pkgs; [
- zip
- unzip
- p7zip
- usbutils
- udiskie
- ];
-
- programs.thunar = {
- enable = true;
- plugins = with pkgs.xfce; [
- thunar-archive-plugin
- thunar-media-tags-plugin
- thunar-volman
- ];
- };
-
- programs.file-roller.enable = true; # thunar zip support
- programs.xfconf.enable = true; # to save thunar settings
-
- services = {
- gvfs.enable = true; # Mount, trash, and other functionalities
- tumbler.enable = true; # Thumbnail support for images
- udisks2.enable = true; # Auto mount usb drives
- };
-}
diff --git a/OLD CONFIGS/system-master_BAK/configuration/flatpak.nix b/OLD CONFIGS/system-master_BAK/configuration/flatpak.nix
deleted file mode 100644
index 7b233d878..000000000
--- a/OLD CONFIGS/system-master_BAK/configuration/flatpak.nix
+++ /dev/null
@@ -1,81 +0,0 @@
-{ config, pkgs, lib, ... }:
-
-let
- # Adjust this path if your module lives elsewhere in the repo
- flatpakConfPath = ../assets/conf/apps/flatpak.conf;
-
- # Parse flatpak.conf: ignore empty lines and comments
- flatpakApps =
- let
- lines = lib.splitString "\n" (builtins.readFile flatpakConfPath);
- cleaned = map (l: lib.strings.trim l) lines;
- in
- builtins.filter (l: l != "" && !(lib.hasPrefix "#" l)) cleaned;
-
- # Shell script that:
- # - adds Flathub if missing
- # - installs missing apps
- # - (optional) removes apps not in the list
- syncFlatpaks = pkgs.writeShellScript "sync-flatpaks" ''
- set -euo pipefail
-
- # Ensure Flathub remote exists (system-wide)
- if ! flatpak remotes --system --columns=name | grep -qx flathub; then
- flatpak remote-add --system --if-not-exists flathub https://dl.flathub.org/repo/flathub.flatpakrepo
- fi
-
- desired_apps=(
- ${lib.concatStringsSep "\n" (map (a: ''"${a}"'') flatpakApps)}
- )
-
- # Install desired apps if missing
- for app in "''${desired_apps[@]}"; do
- if ! flatpak info --system "$app" >/dev/null 2>&1; then
- flatpak install --system -y --noninteractive flathub "$app"
- fi
- done
-
- # OPTIONAL: remove system apps not listed (uncomment to enforce strictly)
- # installed="$(flatpak list --system --app --columns=application | sed '/^$/d')"
- # for app in $installed; do
- # keep=0
- # for want in "''${desired_apps[@]}"; do
- # if [ "$app" = "$want" ]; then keep=1; break; fi
- # done
- # if [ "$keep" -eq 0 ]; then
- # flatpak uninstall --system -y --noninteractive "$app" || true
- # fi
- # done
- '';
-in
-{
- # Native NixOS Flatpak support
- services.flatpak.enable = true; # enables Flatpak on NixOS :contentReference[oaicite:1]{index=1}
-
- # Strongly recommended for Flatpak desktop integration
- # (Adjust portals to your DE/WM if you want, this is a safe default.)
- xdg.portal = {
- enable = true;
- extraPortals = [ pkgs.xdg-desktop-portal-gtk ];
- };
-
- # Ensure the config file is present on the system (optional but convenient)
- environment.etc."flatpak/flatpak.conf".source = flatpakConfPath;
-
- # Run sync after boot and after rebuilds, once networking is up
- systemd.services.flatpak-sync = {
- description = "Install Flatpak apps listed in flatpak.conf";
- wantedBy = [ "multi-user.target" ];
- wants = [ "network-online.target" ];
- after = [ "network-online.target" ];
-
- serviceConfig = {
- Type = "oneshot";
- ExecStart = syncFlatpaks;
- };
-
- # Re-run when the config changes (best-effort)
- restartTriggers = [ flatpakConfPath ];
- path = [ pkgs.flatpak pkgs.coreutils pkgs.gnugrep pkgs.gnused ];
- };
-}
diff --git a/OLD CONFIGS/system-master_BAK/configuration/hyprland.nix b/OLD CONFIGS/system-master_BAK/configuration/hyprland.nix
deleted file mode 100755
index 4f02336b2..000000000
--- a/OLD CONFIGS/system-master_BAK/configuration/hyprland.nix
+++ /dev/null
@@ -1,80 +0,0 @@
-{ pkgs, ... }:
-{
- nix.settings = {
- # add the hyprland cache so that we dont build hyprland from source
- substituters = [ "https://hyprland.cachix.org" ];
- trusted-public-keys = [
- "hyprland.cachix.org-1:a7pgxzMz7+chwVL3/pzj6jIBMioiJM7ypFP8PwtkuGc="
- ];
- };
-
- # these extra portals allow for things like screen sharing
- xdg = {
- portal = {
- enable = true;
- extraPortals = [
- pkgs.xdg-desktop-portal-wlr
- pkgs.xdg-desktop-portal-gtk
- ];
- };
- };
-
- environment.systemPackages = with pkgs; [
- hyprland # the actual package
- walker # launcher
- uwsm # wayland session manager
- hyprland-qtutils # needed by hyprland
- hyprpolkitagent # polkit agent
- grimblast # screenshot
- ];
-
- # we use uwsm to manage launching hyprland
- # uswm will add hyprland to the login sessions with tuigreet.
- programs = {
- uwsm.enable = true;
- uwsm.waylandCompositors = {
- hyprland = {
- prettyName = "Hyprland";
- comment = "Hyprland compositor managed by UWSM";
- binPath = "/run/current-system/sw/bin/Hyprland";
- };
- };
-
- hyprland = {
- withUWSM = true;
- enable = true;
- xwayland.enable = true;
- };
- };
-
- # this is mainly for the lock screen
- # lock.png is provided elsewhere
- services.xserver = {
- enable = true;
-
- desktopManager = {
- xterm.enable = false;
- };
-
-
- displayManager = {
- lightdm.background = ./lock.png;
- };
- };
-
- # this is a lot of env vars.
- # and this requires some cleanup
- # but hyprland moves fast and some of these are probably outdated already
- environment.sessionVariables = {
- XDG_SESSION_TYPE="wayland";
- XDG_CURRENT_DESKTOP="Hyprland";
- XDG_SESSION_DESKTOP="Hyprland";
- NIXOS_OZONE_WL="1";
- XCURSOR_SIZE="24";
- };
-
- # allow hyprlock (lockscreen) to lock user session
- security.pam.services.hyprlock = { };
- security.polkit.enable = true;
- security.pam.services.gdm.enableGnomeKeyring = true;
-}
diff --git a/OLD CONFIGS/system-master_BAK/configuration/locale.nix b/OLD CONFIGS/system-master_BAK/configuration/locale.nix
deleted file mode 100755
index 532dd7097..000000000
--- a/OLD CONFIGS/system-master_BAK/configuration/locale.nix
+++ /dev/null
@@ -1,24 +0,0 @@
-{ user, ... } :
-let
- locale = user.locale;
- defaultLocale = "nl_NL.UTF-8";
-in
-{
- # Set your time zone.
- time.timeZone = "Europe/Amsterdam";
-
- # Select internationalisation properties.
- i18n.defaultLocale = defaultLocale;
-
- i18n.extraLocaleSettings = {
- LC_ADDRESS = locale;
- LC_IDENTIFICATION = locale;
- LC_MEASUREMENT = locale;
- LC_MONETARY = locale;
- LC_NAME = locale;
- LC_NUMERIC = locale;
- LC_PAPER = locale;
- LC_TELEPHONE = locale;
- LC_TIME = defaultLocale;
- };
-}
diff --git a/OLD CONFIGS/system-master_BAK/configuration/login.nix b/OLD CONFIGS/system-master_BAK/configuration/login.nix
deleted file mode 100755
index 01b1672a9..000000000
--- a/OLD CONFIGS/system-master_BAK/configuration/login.nix
+++ /dev/null
@@ -1,15 +0,0 @@
-{ pkgs, user, ... } :
-{
- environment.systemPackages = with pkgs; [
- tuigreet
- ];
-
- services.greetd = {
- enable = true;
- settings = {
- default_session = {
- command = pkgs.lib.mkForce "${pkgs.tuigreet}/bin/tuigreet --remember --time --time-format '%I:%M %p | %a • %h | %F'";
- };
- };
- };
-}
diff --git a/OLD CONFIGS/system-master_BAK/configuration/networking.nix b/OLD CONFIGS/system-master_BAK/configuration/networking.nix
deleted file mode 100755
index 0b0707253..000000000
--- a/OLD CONFIGS/system-master_BAK/configuration/networking.nix
+++ /dev/null
@@ -1,16 +0,0 @@
-{ pkgs, ... } : {
- networking = {
- # allow automatic ip assignment when connecting to a network
- useDHCP = pkgs.lib.mkDefault true;
- networkmanager.enable = true;
- firewall.enable = true;
-
- # let wifi info be NOT declarative, allowing user to configure wifi.
- wireless.userControlled.enable = true;
- wireless.iwd.enable = true;
- networkmanager.wifi.backend = "wpa_supplicant";
- };
-
- # tui to manage wifi networks
- environment.systemPackages = with pkgs; [ impala ];
-}
diff --git a/OLD CONFIGS/system-master_BAK/configuration/nix-settings.nix b/OLD CONFIGS/system-master_BAK/configuration/nix-settings.nix
deleted file mode 100755
index 7b82abf7d..000000000
--- a/OLD CONFIGS/system-master_BAK/configuration/nix-settings.nix
+++ /dev/null
@@ -1,38 +0,0 @@
-{ pkgs, user, ... } :
-{
- nix.settings = {
- # enable flakes
- experimental-features = ["nix-command" "flakes"];
-
- # add a cache that speed up new applications by downloading binaries
- # from the trusted cache instead of compiling from sourcer
- substituters = [
- "https://nix-community.cachix.org"
- ];
- # trust the cache public key
- trusted-public-keys = [
- "nix-community.cachix.org-1:mB9FSh9qf2dCimDSUo8Zy7bkq5CX+/rkCWyvRCYg3Fs="
- ];
- };
-
- # allow proprietary software on this machine. I'm not a purist.
- nixpkgs.config.allowUnfree = true;
- # unityhub depends on this... for now
- nixpkgs.config.permittedInsecurePackages = [ "libxml2-2.13.8" ];
-
- # this declares how often old configurations are cleared up.
- # i cleanup anything older than a week, every week.
- nix.gc = {
- automatic = true;
- options = "--delete-older-than 7d";
- dates = "weekly";
- };
-
- programs = {
- # command line utility that makes applying changes easy and pretty
- nh = {
- enable = true;
- flake = "/home/${user.username}/system";
- };
- };
-}
diff --git a/OLD CONFIGS/system-master_BAK/configuration/packages.nix b/OLD CONFIGS/system-master_BAK/configuration/packages.nix
deleted file mode 100644
index 78ae6ee19..000000000
--- a/OLD CONFIGS/system-master_BAK/configuration/packages.nix
+++ /dev/null
@@ -1,41 +0,0 @@
-{ lib, pkgs, ... }:
-
-let
- # Adjust this path if you place apps.nix elsewhere in the repo.
- # Best practice: keep it relative to the flake repo so flakes can read it.
- packagesConfPath = ../assets/conf/apps/packages.conf;
-
- raw = builtins.readFile packagesConfPath;
-
- # Split into lines, trim whitespace, drop empty lines and comment lines.
- lines =
- let
- all = lib.splitString "\n" raw;
- trimmed = map lib.strings.trim all;
- in
- builtins.filter (l: l != "" && !(lib.hasPrefix "#" l)) trimmed;
-
- # Resolve a name like:
- # "wget" -> pkgs.wget
- # "kdePackages.okular" -> pkgs.kdePackages.okular
- # "_1password-gui" -> pkgs."_1password-gui"
- resolvePkg = name:
- let
- parts = lib.splitString "." name;
- found = lib.attrByPath parts null pkgs;
- in
- if found == null then
- throw ''
- apps.nix: Package "${name}" from ${toString packagesConfPath} not found in pkgs.
- Only packages available on https://search.nixos.org/packages can be installed.
- Fix the name (or attribute path) and rebuild.
- ''
- else
- found;
-
- packages = map resolvePkg lines;
-
-in
-{
- environment.systemPackages = packages;
-}
diff --git a/OLD CONFIGS/system-master_BAK/configuration/services.nix b/OLD CONFIGS/system-master_BAK/configuration/services.nix
deleted file mode 100755
index 6778e81cf..000000000
--- a/OLD CONFIGS/system-master_BAK/configuration/services.nix
+++ /dev/null
@@ -1,23 +0,0 @@
-{ user, ...} :
-{
- services = {
- blueman.enable = true; # bluetooth manager
- fwupd.enable = true; # firmware updating service
- fstrim.enable = true; # ssd maintenance service
- thermald.enable = true; # thermal regulation service
- printing.enable = true; # printing services, cups
- gnome.gnome-keyring.enable = true; # keyring
- flatpak.enable = true; # allow installing things from flatpaks
- #flatpak remote-add --if-not-exists flathub https://flathub.org/repo/flathub.flatpakrepo
-
- # printer discovery
- avahi = {
- enable = true;
- nssmdns4 = true;
- openFirewall = true;
- };
- };
-
- virtualisation.docker.enable = true; # enable docker
- users.users.${user.username}.extraGroups = [ "docker" ]; # add self to docker user group
-}
diff --git a/OLD CONFIGS/system-master_BAK/configuration/sops.nix b/OLD CONFIGS/system-master_BAK/configuration/sops.nix
deleted file mode 100755
index 16439df2d..000000000
--- a/OLD CONFIGS/system-master_BAK/configuration/sops.nix
+++ /dev/null
@@ -1,10 +0,0 @@
-# { user, ...} :
-# {
-# sops.defaultSopsFile = ../secrets/secrets.yaml;
-# sops.defaultSopsFormat = "yaml";
-# sops.age.keyFile = "/home/${user.username}/.config/sops/age/keys.txt";
-#
-# sops.secrets.claude_key = { # anthropic claude api key, used in emacs
-# owner = "${user.username}";
-# };
-# }
diff --git a/OLD CONFIGS/system-master_BAK/configuration/test/hyprland.nix b/OLD CONFIGS/system-master_BAK/configuration/test/hyprland.nix
deleted file mode 100644
index 4f02336b2..000000000
--- a/OLD CONFIGS/system-master_BAK/configuration/test/hyprland.nix
+++ /dev/null
@@ -1,80 +0,0 @@
-{ pkgs, ... }:
-{
- nix.settings = {
- # add the hyprland cache so that we dont build hyprland from source
- substituters = [ "https://hyprland.cachix.org" ];
- trusted-public-keys = [
- "hyprland.cachix.org-1:a7pgxzMz7+chwVL3/pzj6jIBMioiJM7ypFP8PwtkuGc="
- ];
- };
-
- # these extra portals allow for things like screen sharing
- xdg = {
- portal = {
- enable = true;
- extraPortals = [
- pkgs.xdg-desktop-portal-wlr
- pkgs.xdg-desktop-portal-gtk
- ];
- };
- };
-
- environment.systemPackages = with pkgs; [
- hyprland # the actual package
- walker # launcher
- uwsm # wayland session manager
- hyprland-qtutils # needed by hyprland
- hyprpolkitagent # polkit agent
- grimblast # screenshot
- ];
-
- # we use uwsm to manage launching hyprland
- # uswm will add hyprland to the login sessions with tuigreet.
- programs = {
- uwsm.enable = true;
- uwsm.waylandCompositors = {
- hyprland = {
- prettyName = "Hyprland";
- comment = "Hyprland compositor managed by UWSM";
- binPath = "/run/current-system/sw/bin/Hyprland";
- };
- };
-
- hyprland = {
- withUWSM = true;
- enable = true;
- xwayland.enable = true;
- };
- };
-
- # this is mainly for the lock screen
- # lock.png is provided elsewhere
- services.xserver = {
- enable = true;
-
- desktopManager = {
- xterm.enable = false;
- };
-
-
- displayManager = {
- lightdm.background = ./lock.png;
- };
- };
-
- # this is a lot of env vars.
- # and this requires some cleanup
- # but hyprland moves fast and some of these are probably outdated already
- environment.sessionVariables = {
- XDG_SESSION_TYPE="wayland";
- XDG_CURRENT_DESKTOP="Hyprland";
- XDG_SESSION_DESKTOP="Hyprland";
- NIXOS_OZONE_WL="1";
- XCURSOR_SIZE="24";
- };
-
- # allow hyprlock (lockscreen) to lock user session
- security.pam.services.hyprlock = { };
- security.polkit.enable = true;
- security.pam.services.gdm.enableGnomeKeyring = true;
-}
diff --git a/OLD CONFIGS/system-master_BAK/flake.lock b/OLD CONFIGS/system-master_BAK/flake.lock
deleted file mode 100755
index df27d3580..000000000
--- a/OLD CONFIGS/system-master_BAK/flake.lock
+++ /dev/null
@@ -1,107 +0,0 @@
-{
- "nodes": {
- "catppuccin": {
- "inputs": {
- "nixpkgs": [
- "nixpkgs"
- ]
- },
- "locked": {
- "lastModified": 1758956381,
- "narHash": "sha256-ROUw5E8CibG3jEy6oHjrkF6/P60eiaUJmc2s2ecC/LM=",
- "owner": "catppuccin",
- "repo": "nix",
- "rev": "02dee881c3e644e2b561f407742f1fd927c40b83",
- "type": "github"
- },
- "original": {
- "owner": "catppuccin",
- "repo": "nix",
- "type": "github"
- }
- },
- "emacs-overlay": {
- "inputs": {
- "nixpkgs": [
- "nixpkgs"
- ],
- "nixpkgs-stable": "nixpkgs-stable"
- },
- "locked": {
- "lastModified": 1759079154,
- "narHash": "sha256-ViNoTyurHYed96NA9sWCxKegtF4JPFXLcD2A4EOp444=",
- "owner": "nix-community",
- "repo": "emacs-overlay",
- "rev": "ae2a59490e94c38d917d1e1bc479bdab6c9c8f1c",
- "type": "github"
- },
- "original": {
- "owner": "nix-community",
- "repo": "emacs-overlay",
- "type": "github"
- }
- },
- "home-manager": {
- "inputs": {
- "nixpkgs": [
- "nixpkgs"
- ]
- },
- "locked": {
- "lastModified": 1759043321,
- "narHash": "sha256-Efi3THvsIS6Qd97s52/PSSHWybDlSbtUZXP8l3AR9Ps=",
- "owner": "nix-community",
- "repo": "home-manager",
- "rev": "c75fd8e300b79502b8eecdacd8a426b12fadb460",
- "type": "github"
- },
- "original": {
- "owner": "nix-community",
- "repo": "home-manager",
- "type": "github"
- }
- },
- "nixpkgs": {
- "locked": {
- "lastModified": 1758690382,
- "narHash": "sha256-NY3kSorgqE5LMm1LqNwGne3ZLMF2/ILgLpFr1fS4X3o=",
- "owner": "nixos",
- "repo": "nixpkgs",
- "rev": "e643668fd71b949c53f8626614b21ff71a07379d",
- "type": "github"
- },
- "original": {
- "owner": "nixos",
- "ref": "nixos-unstable",
- "repo": "nixpkgs",
- "type": "github"
- }
- },
- "nixpkgs-stable": {
- "locked": {
- "lastModified": 1758791193,
- "narHash": "sha256-F8WmEwFoHsnix7rt290R0rFXNJiMbClMZyIC/e+HYf0=",
- "owner": "NixOS",
- "repo": "nixpkgs",
- "rev": "25e53aa156d47bad5082ff7618f5feb1f5e02d01",
- "type": "github"
- },
- "original": {
- "owner": "NixOS",
- "ref": "nixos-25.05",
- "repo": "nixpkgs",
- "type": "github"
- }
- },
- "root": {
- "inputs": {
- "catppuccin": "catppuccin",
- "emacs-overlay": "emacs-overlay",
- "home-manager": "home-manager",
- "nixpkgs": "nixpkgs"
- }
- }
- },
- "root": "root",
- "version": 7
-}
diff --git a/OLD CONFIGS/system-master_BAK/flake.nix b/OLD CONFIGS/system-master_BAK/flake.nix
deleted file mode 100755
index 7bfd1e5be..000000000
--- a/OLD CONFIGS/system-master_BAK/flake.nix
+++ /dev/null
@@ -1,89 +0,0 @@
-{
- description = "Henrov's nixos configuration";
-
- inputs = {
- nixpkgs.url = "github:nixos/nixpkgs/nixos-unstable";
-
- home-manager = {
- url = "github:nix-community/home-manager";
- inputs.nixpkgs.follows = "nixpkgs";
- };
-
- emacs-overlay = {
- url = "github:nix-community/emacs-overlay";
- inputs.nixpkgs.follows = "nixpkgs";
- };
-
-# sops-nix = {
-# url = "github:Mic92/sops-nix";
-# inputs.nixpkgs.follows = "nixpkgs";
-# };
-#
- catppuccin = {
- url = "github:catppuccin/nix";
- inputs.nixpkgs.follows = "nixpkgs";
- };
- };
-
- outputs = {
- nixpkgs,
- home-manager,
- emacs-overlay,
- # sops-nix,
- catppuccin,
- ...
- }:
- let
- user = import ./user.nix;
- lib = nixpkgs.lib;
- machines = [
- "traveldroid"
- ];
- pkgs = import nixpkgs {
- inherit (user) system;
- };
- in
- {
- nixosConfigurations = builtins.listToAttrs (
- builtins.map (machine: {
- name = machine;
- value = lib.nixosSystem {
- modules = [
- ({ ... }: {
- nixpkgs.overlays = [ emacs-overlay.overlays.default ];
- })
- ./machines/${machine}/configuration.nix
- home-manager.nixosModules.home-manager
- {
- home-manager.useGlobalPkgs = true;
- home-manager.useUserPackages = true;
- home-manager.extraSpecialArgs = {
- inherit user;
- };
- home-manager.backupFileExtension = "backup";
- home-manager.users.${user.username} = {
- imports = [
- ./machines/${machine}/home.nix
- catppuccin.homeModules.catppuccin
- ];
- };
- }
- #sops-nix.nixosModules.sops # sops
- catppuccin.nixosModules.catppuccin # theme
- ];
- specialArgs = {
- hostname = machine;
- inherit user;
- };
- };
- }) machines
- );
- devShells.${user.system}.default = pkgs.mkShell {
- buildInputs = with pkgs; [
- nil # nix lsp server
- nixfmt-rfc-style # nix formatter
- #sops # used to edit secrets
- ];
- };
- };
- }
diff --git a/OLD CONFIGS/system-master_BAK/hardware/hardware.nix b/OLD CONFIGS/system-master_BAK/hardware/hardware.nix
deleted file mode 100755
index 0b9664383..000000000
--- a/OLD CONFIGS/system-master_BAK/hardware/hardware.nix
+++ /dev/null
@@ -1,23 +0,0 @@
-{ pkgs, lib, user, config, ...} :
-{
- nixpkgs.hostPlatform = lib.mkDefault user.system; # x86_64-linux
- powerManagement.cpuFreqGovernor = lib.mkDefault "powersave"; # enable power saving on the cpu
-
- # update cpu microcode with firmware that allows redistribution
- hardware.cpu.intel.updateMicrocode = lib.mkDefault config.hardware.enableRedistributableFirmware;
-
- hardware = {
- # always enable bluetooth
- bluetooth.enable = true;
-
- # always enable graphics drivers and enable a bunch of layers for it (including vulkan validation)
- graphics = {
- enable = true;
- extraPackages = with pkgs; [
- vulkan-validation-layers # helps catch and debug vulkan crashes
- ];
- };
- };
-
- hardware.enableAllFirmware = true; # enable all firmware regardless of license
-}
diff --git a/OLD CONFIGS/system-master_BAK/home/default.nix b/OLD CONFIGS/system-master_BAK/home/default.nix
deleted file mode 100755
index e9b7c3309..000000000
--- a/OLD CONFIGS/system-master_BAK/home/default.nix
+++ /dev/null
@@ -1,46 +0,0 @@
-{ pkgs, user, ... } :
-{
- imports = [
- ./waybar.nix
- ./wallpaper.nix
- ./lock.nix
- ./unity.nix
- ./hyprland.nix
- ./walker.nix
- ./theme.nix
- ./terminal.nix
- ./dev.nix
- ./emacs
- ];
-
- home.username = "${user.username}";
- home.homeDirectory = pkgs.lib.mkDefault "/home/${user.username}";
- home.stateVersion = user.stateVersion;
-
- home.packages = with pkgs; [
- audacity # audio recording
- handbrake # video transcoding
- xdg-utils # utils, for screensharing
- vlc # media player
- pavucontrol # audio control
- # everdo # gtd tool
- spotify # music player
- simple-scan # scanner software
- # gimp2 # image editor
- mpv # media player
- kdePackages.kate # best texteditor
- libreoffice # office suite
- obsidian # knowegde base
- vivaldi # browser
- brave # browser
- kdePackages.kdeconnect-kde # KDE Connect
- pamixer # volumemixer
-
- ];
-
- services.dunst.enable = true; # notifications daemon
-
- programs.obs-studio.enable = true; # screen recording tool
-
- programs.home-manager.enable = true;
-}
diff --git a/OLD CONFIGS/system-master_BAK/home/dev.nix b/OLD CONFIGS/system-master_BAK/home/dev.nix
deleted file mode 100755
index 606c672b3..000000000
--- a/OLD CONFIGS/system-master_BAK/home/dev.nix
+++ /dev/null
@@ -1,71 +0,0 @@
-{ user, pkgs, ... }:
-{
- programs = {
- vscode.enable = true; # yes, sometimes i like to dabble
- vim.enable = true; # and this one too
- ripgrep.enable = true; # fast text search across projects
- btop.enable = true; # even better task manager
-
- # nicer terminal info
- starship = {
- enable = true;
- enableZshIntegration = true;
- enableBashIntegration = true;
- };
-
- # fuzzy finder
- fzf = {
- enable = true;
- enableZshIntegration = true;
- enableBashIntegration = true;
- };
-
- # better cd
- zoxide = {
- enable = true;
- enableZshIntegration = true;
- enableBashIntegration = true;
- };
-
- # better ls
- eza = {
- enable = true;
- enableZshIntegration = true;
- enableBashIntegration = true;
- };
-
- # this is mainly for integration with nix flakes in individual projects
- direnv = {
- enable = true;
- enableZshIntegration = true;
- enableBashIntegration = true;
- nix-direnv.enable = true;
- };
-
- # zsh everywhere with oh-my-zsh
- zsh = {
- enable = true;
- oh-my-zsh = {
- enable = true;
- plugins = [ "git" ];
- theme = "robbyrussell";
- };
-
- shellAliases = {
- cd = "z"; # zoxide
- };
-
- # for emacs-eat package
- initContent = pkgs.lib.mkOrder 1200 ''
- [ -n "$EAT_SHELL_INTEGRATION_DIR" ] && \
- source "$EAT_SHELL_INTEGRATION_DIR/zsh"
- '';
- };
-
- # git with lfs
- git = {
- lfs.enable = true;
- enable = true;
- };
- };
-}
diff --git a/OLD CONFIGS/system-master_BAK/home/emacs/default.nix b/OLD CONFIGS/system-master_BAK/home/emacs/default.nix
deleted file mode 100755
index f5d7d4580..000000000
--- a/OLD CONFIGS/system-master_BAK/home/emacs/default.nix
+++ /dev/null
@@ -1,72 +0,0 @@
-{ pkgs, ... }:
-{
- programs.emacs = {
- enable = true;
- # install with tree sitter enabled
- package = (pkgs.emacs-pgtk.override { withTreeSitter = true; });
- extraPackages = epkgs: [
- # also install all tree sitter grammars
- epkgs.manualPackages.treesit-grammars.with-all-grammars
- epkgs.nerd-icons # nerd fonts support
- epkgs.doom-modeline # model line
- epkgs.diminish # hides modes from modeline
- epkgs.eldoc # doc support
- epkgs.pulsar # pulses the cursor when jumping about
- epkgs.which-key # help porcelain
- epkgs.expreg # expand region
- epkgs.vundo # undo tree
- epkgs.puni # structured editing
- epkgs.avy # jumping utility
- epkgs.consult # emacs right click
- epkgs.vertico # minibuffer completion
- epkgs.marginalia # annotations for completions
- epkgs.crux # utilities
- epkgs.magit # git porcelain
- epkgs.nerd-icons-corfu # nerd icons for completion
- epkgs.corfu # completion
- epkgs.cape # completion extensions
- epkgs.orderless # search paradigm
- epkgs.yasnippet # snippets support
- epkgs.yasnippet-snippets # commonly used snippets
- epkgs.rg # ripgrep
- epkgs.exec-path-from-shell # load env and path
- epkgs.eat # better shell
- epkgs.rust-mode # rust mode (when rust-ts doesn't cut it)
- epkgs.rustic # more rust things
- epkgs.nix-mode # nix lang
- epkgs.hcl-mode # hashicorp file mode
- epkgs.shell-pop # quick shell popup
- epkgs.envrc # support for loading .envrc
- epkgs.nixpkgs-fmt # format nix files
- epkgs.f # string + file utilities
- epkgs.gptel # llm chat (mainly claude)
-
- epkgs.catppuccin-theme # catppuccin theme
- epkgs.eldoc-box # docs in a box
- epkgs.sideline # mainly for flymake errors on the side
- epkgs.sideline-flymake # mainly for flymake errors on the side
- epkgs.sideline-eglot # mainly for flymake errors on the side
- ];
- };
-
- home.sessionVariables = {
- EDITOR = "emacs";
- XDG_SCREENSHOTS_DIR = "~/screenshots";
- };
-
- home.file = {
- emacs-init = {
- source = ./early-init.el;
- target = ".emacs.d/early-init.el";
- };
-
- emacs = {
- source = ./init.el;
- target = ".emacs.d/init.el";
- };
- };
-
- services.nextcloud-client = {
- enable = true;
- };
-}
diff --git a/OLD CONFIGS/system-master_BAK/home/emacs/early-init.el b/OLD CONFIGS/system-master_BAK/home/emacs/early-init.el
deleted file mode 100755
index d3f5c8200..000000000
--- a/OLD CONFIGS/system-master_BAK/home/emacs/early-init.el
+++ /dev/null
@@ -1,118 +0,0 @@
-;;; package --- early init -*- lexical-binding: t -*-
-
-;;; Commentary:
-;;; Prevents white flash and better Emacs defaults
-
-;;; Code:
-(set-language-environment "UTF-8")
-
-(setq-default
- default-frame-alist
- '((background-color . "#1e1e2e")
- (bottom-divider-width . 1) ; Thin horizontal window divider
- (foreground-color . "#bac2de") ; Default foreground color
- (fullscreen . maximized) ; Maximize the window by default
- (horizontal-scroll-bars . nil) ; No horizontal scroll-bars
- (left-fringe . 8) ; Thin left fringe
- (menu-bar-lines . 0) ; No menu bar
- (right-divider-width . 1) ; Thin vertical window divider
- (right-fringe . 8) ; Thin right fringe
- (tool-bar-lines . 0) ; No tool bar
- (undecorated . t) ; Remove extraneous X decorations
- (vertical-scroll-bars . nil)) ; No vertical scroll-bars
-
- user-full-name "Henrov henrov" ; ME!
-
- ;; memory configuration
- ;; Higher garbage collection threshold, prevents frequent gc locks, reset later
- gc-cons-threshold most-positive-fixnum
- ;; Ignore warnings for (obsolete) elisp compilations
- byte-compile-warnings '(not obsolete)
- ;; And other log types completely
- warning-suppress-log-types '((comp) (bytecomp))
- ;; Large files are okay in the new millenium.
- large-file-warning-threshold 100000000
- ;; dont show garbage collection messages at startup, will reset later
- garbage-collection-messages nil
- ;; native compilation
- package-native-compile t
- native-comp-warning-on-missing-source nil
- native-comp-async-report-warnings-errors 'silent
-
-
- ;; Read more based on system pipe capacity
- read-process-output-max (max (* 10240 10240) read-process-output-max)
-
- ;; scroll configuration
- scroll-margin 0 ; Lets scroll to the end of the margin
- scroll-conservatively 100000 ; Never recenter the window
- scroll-preserve-screen-position 1 ; Scrolling back and forth
-
- ;; frame config
- ;; Improve emacs startup time by not resizing to adjust for custom settings
- frame-inhibit-implied-resize t
- ;; Dont resize based on character height / width but to exact pixels
- frame-resize-pixelwise t
-
- ;; backups & files
- backup-directory-alist '(("." . "~/.backups/")) ; Don't clutter
- backup-by-copying t ; Don't clobber symlinks
- create-lockfiles nil ; Don't have temp files
- delete-old-versions t ; Cleanup automatically
- kept-new-versions 6 ; Update every few times
- kept-old-versions 2 ; And cleanup even more
- version-control t ; Version them backups
- delete-by-moving-to-trash t ; Dont delete, send to trash instead
-
- ;; startup
- inhibit-startup-screen t ; I have already done the tutorial. Twice
- inhibit-startup-message t ; I know I am ready
- inhibit-startup-echo-area-message t ; Yep, still know it
- initial-scratch-message nil ; I know it is the scratch buffer!
- initial-buffer-choice nil
- inhibit-startup-buffer-menu t
- inhibit-x-resources t
- initial-major-mode 'fundamental-mode
-
- pgtk-wait-for-event-timeout 0.001 ; faster child frames
-
- ad-redefinition-action 'accept ; dont care about legacy things being redefined
- inhibit-compacting-font-caches t
-
- ;; tabs
- tab-width 4 ; Always tab 4 spaces.
- indent-tabs-mode nil ; Never use actual tabs.
-
- ;; rendering
- cursor-in-non-selected-windows nil ; dont render cursors other windows
-
- ;; packages
- use-package-always-defer t
-
- load-prefer-newer t
-
- default-input-method nil
-
- use-dialog-box nil
-
- use-file-dialog nil
-
- use-package-expand-minimally t
-
- package-enable-at-startup nil
-
- use-package-enable-imenu-support t
-
- auto-mode-case-fold nil ; No second pass of case-insensitive search over auto-mode-alist.
-
- package-archives '(("melpa" . "https://melpa.org/packages/")
- ("gnu" . "https://elpa.gnu.org/packages/")
- ("nongnu" . "https://elpa.nongnu.org/nongnu/")
- ("melpa-stable" . "https://stable.melpa.org/packages/"))
-
- package-archive-priorities '(("gnu" . 99)
- ("nongnu" . 80)
- ("melpa" . 70)
- ("melpa-stable" . 50))
- )
- ;;; early-init.el ends here
diff --git a/OLD CONFIGS/system-master_BAK/home/emacs/init.el b/OLD CONFIGS/system-master_BAK/home/emacs/init.el
deleted file mode 100755
index 802e27ad3..000000000
--- a/OLD CONFIGS/system-master_BAK/home/emacs/init.el
+++ /dev/null
@@ -1,400 +0,0 @@
-;;; package --- Summary - My minimal Emacs init file -*- lexical-binding: t -*-
-
- ;;; Commentary:
- ;;; Simple Emacs setup I carry everywhere
-
- ;;; Code:
-(setq custom-file (locate-user-emacs-file "custom.el"))
-(load custom-file 'noerror) ;; no error on missing custom file
-
-(require 'package)
-(package-initialize)
-
-(defun reset-custom-vars ()
- "Resets the custom variables that were set to crazy numbers"
- (setopt gc-cons-threshold (* 1024 1024 100))
- (setopt garbage-collection-messages t))
-
-(use-package emacs
- :custom
- (native-comp-async-query-on-exit t)
- (read-answer-short t)
- (use-short-answers t)
- (enable-recursive-minibuffers t)
- (which-func-update-delay 1.0)
- (visible-bell nil)
- (custom-buffer-done-kill t)
- (whitespace-line-column nil)
- (x-underline-at-descent-line t)
- (imenu-auto-rescan t)
- (uniquify-buffer-name-style 'forward)
- (confirm-nonexistent-file-or-buffer nil)
- (create-lockfiles nil)
- (make-backup-files nil)
- (kill-do-not-save-duplicates t)
- (sentence-end-double-space nil)
- (treesit-enabled-modes t)
- :init
- ;; base visual
- (menu-bar-mode -1) ;; no menu bar
- (toggle-scroll-bar -1) ;; no scroll bar
- (tool-bar-mode -1) ;; no tool bar either
- (blink-cursor-mode -1) ;; stop blinking
-
- ;; font of the century
- (set-frame-font "Aporetic Sans Mono 12" nil t)
-
- :bind
- (("C-" . pixel-scroll-precision) ; dont zoom in please, just scroll
- ("C-" . pixel-scroll-precision) ; dont zoom in either, just scroll
- ("C-x k" . kill-current-buffer)) ; kill the buffer, dont ask
- :hook
- (text-mode . delete-trailing-whitespace-mode)
- (prog-mode . delete-trailing-whitespace-mode)
- (after-init . global-display-line-numbers-mode) ;; always show line numbers
- (after-init . column-number-mode) ;; column number in the mode line
- (after-init . size-indication-mode) ;; file size in the mode line
- (after-init . pixel-scroll-precision-mode) ;; smooth mouse scroll
- (after-init . electric-pair-mode) ;; i mean ... parens should auto create
- (after-init . reset-custom-vars)
- )
-
-(use-package autorevert
- :ensure nil
- :custom
- (auto-revert-interval 3)
- (auto-revert-remote-files nil)
- (auto-revert-use-notify t)
- (auto-revert-avoid-polling nil)
- (auto-revert-verbose t)
- :hook
- (after-init . global-auto-revert-mode))
-
-(use-package recentf
- :ensure nil
- :commands (recentf-mode recentf-cleanup)
- :hook
- (after-init . recentf-mode)
- :custom
- (recentf-auto-cleanup 'never)
- (recentf-exclude
- (list "\\.tar$" "\\.tbz2$" "\\.tbz$" "\\.tgz$" "\\.bz2$"
- "\\.bz$" "\\.gz$" "\\.gzip$" "\\.xz$" "\\.zip$"
- "\\.7z$" "\\.rar$"
- "COMMIT_EDITMSG\\'"
- "\\.\\(?:gz\\|gif\\|svg\\|png\\|jpe?g\\|bmp\\|xpm\\)$"
- "-autoloads\\.el$" "autoload\\.el$"))
-
- :config
- ;; A cleanup depth of -90 ensures that `recentf-cleanup' runs before
- ;; `recentf-save-list', allowing stale entries to be removed before the list
- ;; is saved by `recentf-save-list', which is automatically added to
- ;; `kill-emacs-hook' by `recentf-mode'.
- (add-hook 'kill-emacs-hook #'recentf-cleanup -90))
-
-(use-package savehist
- :ensure nil
- :commands (savehist-mode savehist-save)
- :hook
- (after-init . savehist-mode)
- :custom
- (savehist-autosave-interval 600)
- (savehist-additional-variables
- '(kill-ring ; clipboard
- register-alist ; macros
- mark-ring global-mark-ring ; marks
- search-ring regexp-search-ring)))
-
-(use-package hl-line
- :ensure nil
- :custom
- (hl-line-sticky-flag nil)
- (global-hl-line-sticky-flag nil)
- :hook
- (after-init . global-hl-line-mode))
-
-(use-package saveplace
- :ensure nil
- :commands (save-place-mode save-place-local-mode)
- :hook
- (after-init . save-place-mode)
- :custom
- (save-place-limit 400))
-
-(use-package nerd-icons
- :custom
- ;; disable bright icon colors
- (nerd-icons-color-icons nil))
-
-(use-package doom-modeline
- :custom
- (inhibit-compacting-font-caches t) ;; speed
- (doom-modeline-buffer-file-name-style 'relative-from-project)
- (doom-modeline-major-mode-icon nil) ;; distracting icons, no thank you
- (doom-modeline-buffer-encoding nil) ;; everything is utf-8 anyway
- (doom-modeline-buffer-state-icon nil) ;; the filename already shows me
- (doom-modeline-lsp nil) ;; lsp state is too distracting, too often
- :hook (after-init . doom-modeline-mode))
-
-(load-theme 'catppuccin :no-confirm)
-
-(use-package diminish :demand t) ;; declutter the modeline
-(use-package eldoc
- :diminish eldoc-mode
- :custom
- (eldoc-echo-area-use-multiline-p nil)) ;; docs for everything
-
-(use-package eldoc-box
- :defer t
- :config
- (set-face-background 'eldoc-box-border (catppuccin-color 'green))
- (set-face-background 'eldoc-box-body (catppuccin-color 'base))
- :bind
- (("M-h" . eldoc-box-help-at-point)))
-
-(use-package pulsar
- :commands pulsar-global-mode pulsar-recenter-top pulsar-reveal-entry
- :init
- (defface pulsar-catppuccin
- `((default :extend t)
- (((class color) (min-colors 88) (background light))
- :background ,(catppuccin-color 'sapphire))
- (((class color) (min-colors 88) (background dark))
- :background ,(catppuccin-color 'sapphire))
- (t :inverse-video t))
- "Alternative nord face for `pulsar-face'."
- :group 'pulsar-faces)
- :custom
- (pulsar-face 'pulsar-catppuccin)
- :hook
- (after-init . pulsar-global-mode))
-
-(use-package which-key
- :commands which-key-mode
- :diminish which-key-mode
- :hook
- (after-init . which-key-mode))
-
-(use-package expreg
- :bind ("M-m" . expreg-expand))
-
-(use-package vundo) ;; undo tree
-
-;; better structured editing
-(use-package puni
- :commands puni-global-mode
- :hook
- (after-init . puni-global-mode))
-
-(use-package avy
- :bind
- ("M-i" . avy-goto-char-2)
- :custom
- (avy-background t))
-
-(use-package consult
- :bind
- ("C-x b" . consult-buffer) ;; orig. switch-to-buffer
- ("M-y" . consult-yank-pop) ;; orig. yank-pop
- ("M-g M-g" . consult-goto-line) ;; orig. goto-line
- ("M-g i" . consult-imenu) ;; consult version is interactive
- ("M-g r" . consult-ripgrep) ;; find in project also works
- :custom
- (consult-narrow-key "<"))
-
-(use-package vertico
- :commands vertico-mode
- :custom
- (read-file-name-completion-ignore-case t)
- (read-buffer-completion-ignore-case t)
- (completion-ignore-case t)
- (enable-recursive-minibuffers t)
- (minibuffer-prompt-properties '(read-only t cursor-intangible t face minibuffer-prompt))
- :init
- (vertico-mode)
- :hook
- (minibuffer-setup-hook . cursor-intangible-mode))
-
-(use-package marginalia
- :commands marginalia-mode
- :hook (after-init . marginalia-mode))
-
-(use-package crux
- :bind
- ("C-c M-e" . crux-find-user-init-file)
- ("C-c C-w" . crux-transpose-windows)
- ("C-c M-d" . crux-find-current-directory-dir-locals-file)
- ("C-a" . crux-move-beginning-of-line))
-
-(use-package magit
- :bind (("C-M-g" . magit-status)))
-
-(use-package nerd-icons-corfu
- :commands nerd-icons-corfu-formatter
- :defines corfu-margin-formatters)
-
-(use-package corfu
- :commands global-corfu-mode
- :custom
- (corfu-cycle t)
- (corfu-auto t)
- (corfu-auto-delay 1)
- (corfu-auto-prefix 3)
- (corfu-separator ?_)
- :hook
- (after-init . global-corfu-mode)
- :config
- (add-to-list 'corfu-margin-formatters #'nerd-icons-corfu-formatter))
-
-(use-package cape)
-
-(use-package orderless
- :custom
- (completion-styles '(orderless partial-completion basic))
- (completion-category-defaults nil)
- (completion-category-overrides nil))
-
-(use-package yasnippet
- :commands yas-global-mode
- :diminish yas-minor-mode
- :hook
- (after-init . yas-global-mode))
-
-(use-package yasnippet-snippets :after yasnippet)
-
-(use-package exec-path-from-shell
- :commands exec-path-from-shell-initialize
- :custom
- (exec-path-from-shell-arguments nil)
- :hook
- (after-init . exec-path-from-shell-initialize))
-
-(use-package nixpkgs-fmt
- :custom
- (nixpkgs-fmt-command "nixfmt"))
-
-(use-package eat
- :bind
- (("C-c e p" . eat-project)
- ("C-c e t" . eat)))
-
-(use-package f :demand t)
-
-(use-package envrc
- :commands envrc-global-mode
- :hook
- (after-init . envrc-global-mode))
-
-(use-package gptel
- :commands gptel-make-anthropic f-read-text
- :config
- (gptel-make-anthropic "Claude"
- :stream t :key (f-read-text "/run/secrets/claude_key")))
-
-(use-package sideline-flymake)
-(use-package sideline-eglot)
-(use-package sideline
- :custom
- (sideline-backends-right '(sideline-flymake sideline-eglot))
- :hook
- (eglot-managed-mode . sideline-mode)
- (flymake-mode . sideline-mode))
-
-(use-package eglot
- :custom
- (eglot-extend-to-xref t)
- (eglot-ignored-server-capabilities '(:inlayHintProvider))
- (jsonrpc-event-hook nil)
- :hook
- (eglot-managed-mode . eldoc-box-hover-mode)
- (before-save . eldoc-format-buffer)
- :bind
- (:map eglot-mode-map
- ("C-c l a" . eglot-code-actions)
- ("C-c l r" . eglot-rename)
- ("C-c l h" . eldoc)
- ("C-c l g" . xref-find-references)
- ("C-c l w" . eglot-reconnect)))
-
-(use-package proced
- :custom
- (proced-auto-update-flag t)
- (proced-auto-update-interval 3)
- (proced-enable-color-flag t)
- (proced-show-remote-processes t))
-
-(use-package org
- :ensure t
- :defer t
- :commands (org-mode org-capture org-agenda)
- :init
- (defvar org-journal-file "~/nextcloud/org/journal.org")
- (defvar org-archive-file "~/nextcloud/org/archive.org")
- (defvar org-notes-file "~/nextcloud/org/notes.org")
- (defvar org-inbox-file "~/nextcloud/org/inbox.org")
- (defvar org-work-file "~/nextcloud/org/work.org")
- (defun my/org-capture-project-target-heading ()
- "Determine Org target headings from the current file's project path.
-
- This function assumes a directory structure like '~/projects/COMPANY/PROJECT/'.
- It extracts 'COMPANY' and 'PROJECT' to use as nested headlines
- for an Org capture template.
-
- If the current buffer is not visi
-ting a file within such a
- project structure, it returns nil, causing capture to default to
- the top of the file."
- (when-let* ((path (buffer-file-name))) ; Ensure we are in a file-visiting buffer
- (let ((path-parts (split-string path "/" t " ")))
- (when-let* ((projects-pos (cl-position "projects" path-parts :test #'string=))
- (company (nth (+ 1 projects-pos) path-parts))
- (project (nth (+ 2 projects-pos) path-parts)))
- ;; Return a list of headlines for Org to find or create.
- (list company project)))))
- :bind
- (("C-c c" . org-capture)
- ("C-c i" . org-store-link)
- ("C-c a" . org-agenda)
- :map org-mode-map
- ("C-c t" . org-toggle-inline-images)
- ("C-c l" . org-toggle-link-display))
- :custom
- (org-agenda-files (list org-inbox-file org-journal-file))
- (org-directory "~/nextcloud/org")
- (org-default-notes-file org-inbox-file)
- (org-archive-location (concat org-archive-file "::* From %s"))
- (org-log-done 'time)
- (org-log-into-drawer t)
- (org-hide-emphasis-markers t)
- (org-src-fontify-natively t)
- (org-src-tab-acts-natively t)
- (org-capture-templates '(("t" "Todo" entry (file org-inbox-file)
- "* TODO %?\n:PROPERTIES:\n:CREATED: %U\n:END:\n\n%a\n\n)")
- ("j" "Journal" entry (file+olp+datetree org-journal-file)
- "* %?\n:PROPERTIES:\n:CREATED: %U\n:END:\n\n%a\n\n")
- ("n" "Note" entry (file org-notes-file)
- "* %?\n:PROPERTIES:\n:CREATED: %U\n:END:\n\n%a\n\n")
- ("p" "Project Task" item
- (file+function org-work-file my/org-capture-project-target-heading)
- "* TODO %? \n CLOCK: %U"
- ))
- )
- :config
- ;; Enable syntax highlighting in code blocks
- (add-hook 'org-mode-hook 'turn-on-font-lock)
- (add-hook 'org-mode-hook 'org-indent-mode))
-
-;; extras
-(use-package comp-run
- :ensure nil
- :config
- (push "tramp-loaddefs.el.gz" native-comp-jit-compilation-deny-list)
- (push "cl-loaddefs.el.gz" native-comp-jit-compilation-deny-list))
-
-(use-package rustic
- :custom
- (rustic-lsp-client 'eglot))
-
-(provide 'init)
-
- ;;; init.el ends here
diff --git a/OLD CONFIGS/system-master_BAK/home/hyprland.nix b/OLD CONFIGS/system-master_BAK/home/hyprland.nix
deleted file mode 100755
index ebabf69ac..000000000
--- a/OLD CONFIGS/system-master_BAK/home/hyprland.nix
+++ /dev/null
@@ -1,215 +0,0 @@
-{
- # required for the default Hyprland config
- programs.kitty.enable = true;
-
- services.hyprpolkitagent.enable = true;
-
- # enable Hyprland
- wayland.windowManager.hyprland.enable = true;
-
- # we start hyprland using uwsm
- wayland.windowManager.hyprland.systemd.enable = false;
-
- # hyprland.conf
- wayland.windowManager.hyprland.settings = {
- exec-once = [
- # read in env vars
- "dbus-update-activation-environment --systemd --all"
- # start waybar
- "uwsm app -- waybar"
- ];
-
- input = {
- follow_mouse = "1";
-
- touchpad = {
- natural_scroll = "no";
- scroll_factor = 0.5;
- };
-
- scroll_factor = 0.5;
-
- accel_profile = "adaptive";
- sensitivity = -0.5; # -1.0 - 1.0, 0 means no modification.
-
- kb_layout = "us";
-
- # very emacs specific, i use caps as an extra ctrl key
- kb_options = "ctrl:nocaps";
- };
-
- cursor = {
- no_hardware_cursors = "true";
- };
-
- general = {
- gaps_in = 2;
- gaps_out = 4;
- border_size = 2;
- "col.active_border" = "$blue $green 45deg";
- "col.inactive_border" = "$base";
-
- layout = "dwindle";
- };
-
- decoration = {
- rounding = 5;
- };
-
- animations = {
- enabled = "yes";
- bezier = "myBezier, 0.05, 0.9, 0.1, 1.05";
-
- animation = [
- "windows, 1, 7, myBezier"
- "windowsOut, 1, 7, default, popin 80%"
- "border, 1, 10, default"
- "borderangle, 1, 8, default"
- "fade, 1, 7, default"
- "workspaces, 1, 6, default"
- ];
- };
-
- dwindle = {
- pseudotile = "yes";
- preserve_split = "yes";
- };
-
- misc = {
- disable_hyprland_logo = true;
- focus_on_activate = true;
- };
-
- "$mainMod" = "SUPER";
-
- bind = [
- "$mainMod, Return, exec, uwsm app -- kitty"
- # use walker to show exec menu
- "$mainMod, Space, exec, walker"
- "$mainMod, P, pseudo"
- "$mainMod, J, togglesplit"
-
- # grimblast
- "$mainMod_SHIFT, p, exec, grimblast -n -f copysave active"
- "$mainMod_SHIFT, a, exec, grimblast -n -f copysave area"
- "$mainMod_ALT, p, exec, grimblast -n -f copysave output"
- "$mainMod_CTRL, p, exec, grimblast -n -f copysave screen"
-
- # Terminal / launcher / kill / reload
- "$mainMod, RETURN, exec, kitty"
- "$mainMod, D, exec, wofi --show drun"
- "$mainMod, Q, killactive"
- "$mainMod_SHIFT, Q, exit"
- "$mainMod_SHIFT, R, exec, hyprctl reload"
- "$mainMod_SHIFT, S, exec, wlogout"
-
- # Default browser
- "$mainMod, W, exec, xdg-open https://about:blank"
-
- # Focus movement
- "$mainMod, H, movefocus, l"
- "$mainMod, L, movefocus, r"
- "$mainMod, K, movefocus, u"
- "$mainMod, J, movefocus, d"
- "$mainMod, left, movefocus, l"
- "$mainMod, right, movefocus, r"
- "$mainMod, up, movefocus, u"
- "$mainMod, down, movefocus, d"
- # Keybindings #
-
- # Move windows
- "$mainMod_SHIFT, H, movewindow, l"
- "$mainMod_SHIFT, L, movewindow, r"
- "$mainMod_SHIFT, K, movewindow, u"
- "$mainMod_SHIFT, J, movewindow, d"
- "$mainMod_SHIFT, left, movewindow, l"
- "$mainMod_SHIFT, right, movewindow, r"
- "$mainMod_SHIFT, up, movewindow, u"
- "$mainMod_SHIFT, down, movewindow, d"
-
- # Resize windows
- "$mainMod CTRL, H, resizeactive, -30 0"
- "$mainMod CTRL, L, resizeactive, 30 0"
- "$mainMod CTRL, K, resizeactive, 0 -30"
- "$mainMod CTRL, J, resizeactive, 0 30"
-
- # Floating / fullscreen
- "$mainMod, V, togglefloating"
- "$mainMod, F, fullscreen, 0"
- "$mainMod_SHIFT, F, fullscreen, 1"
-
- # Workspaces
- "$mainMod, 1, workspace, 1"
- "$mainMod, 2, workspace, 2"
- "$mainMod, 3, workspace, 3"
- "$mainMod, 4, workspace, 4"
- "$mainMod, 5, workspace, 5"
- "$mainMod, 6, workspace, 6"
- "$mainMod, 7, workspace, 7"
- "$mainMod, 8, workspace, 8"
- "$mainMod, 9, workspace, 9"
- "$mainMod, 0, workspace, 10"
-
- "$mainMod_SHIFT, 1, movetoworkspace, 1"
- "$mainMod_SHIFT, 2, movetoworkspace, 2"
- "$mainMod_SHIFT, 3, movetoworkspace, 3"
- "$mainMod_SHIFT, 4, movetoworkspace, 4"
- "$mainMod_SHIFT, 5, movetoworkspace, 5"
- "$mainMod_SHIFT, 6, movetoworkspace, 6"
- "$mainMod_SHIFT, 7, movetoworkspace, 7"
- "$mainMod_SHIFT, 8, movetoworkspace, 8"
- "$mainMod_SHIFT, 9, movetoworkspace, 9"
- "$mainMod_SHIFT, 0, movetoworkspace, 10"
-
- # Cycle workspaces
- "$mainMod, mouse_down, workspace, e+1"
- "$mainMod, mouse_up, workspace, e-1"
-
- # Mouse drag
- "$mainMod, mouse:272, movewindow"
- "$mainMod, mouse:273, resizewindow"
-
- #########################
- # Audio (pamixer)
- #########################
- "XF86AudioRaiseVolume, exec, pamixer -i 5"
- "XF86AudioLowerVolume, exec, pamixer -d 5"
- "XF86AudioMute, exec, pamixer -t"
- "XF86AudioMicMute, exec, pamixer --default-source -t"
-
- #########################
- # Media (playerctl)
- #########################
- "XF86AudioPlay, exec, playerctl play-pause"
- "XF86AudioPause, exec, playerctl pause"
- "XF86AudioNext, exec, playerctl next"
- "XF86AudioPrev, exec, playerctl previous"
- "XF86AudioStop, exec, playerctl stop"
-
- #########################
- # Brightness (brightnessctl)
- #########################
- "XF86MonBrightnessUp, exec, brightnessctl set +10%"
- "XF86MonBrightnessDown, exec, brightnessctl set 10%-"
- "XF86KbdBrightnessUp, exec, brightnessctl -d '*kbd_backlight*' set +10%"
- "XF86KbdBrightnessDown, exec, brightnessctl -d '*kbd_backlight*' set 10%-"
-
- #########################
- # Power / session
- #########################
- "XF86Sleep, exec, systemctl suspend"
- "XF86PowerOff, exec, systemctl poweroff"
- "XF86WakeUp, exec, systemctl suspend"
-
-
- #########################
- # Start apps
- #########################
- "CTRLALT, B, exec, flatpak run eu.betterbird.Betterbird"
- "CTRLALT, S, exec, spotify"
- "CTRLALT, z, exec, flatpak run app.zen_browser.zen"
-
- "$mainMod_SHIFT, S, exec, wlogout"
- ];
- };
-}
diff --git a/OLD CONFIGS/system-master_BAK/home/lock.nix b/OLD CONFIGS/system-master_BAK/home/lock.nix
deleted file mode 100755
index d2d16fbb2..000000000
--- a/OLD CONFIGS/system-master_BAK/home/lock.nix
+++ /dev/null
@@ -1,155 +0,0 @@
-{ pkgs, ... } :
-{
- home.packages = with pkgs; [
- hyprlock
- hypridle
- wlogout
- ];
-
-
- home.file = {
- lock = {
- source = ../assets/lock.png;
- target = ".lock.png";
- };
- };
-
- services = {
- # hypridle to
- # 150 seconds - turn of monitor
- # 300 seconds - lock screen
- # 330 seconds - turn of monitor
- # 30 minutes - put to sleep
- hypridle = {
- enable = true;
- settings = {
- general = {
- lock_cmd = "pidof hyprlock || hyprlock"; # avoid starting multiple hyprlock instances.
- before_sleep_cmd = "loginctl lock-session"; # lock before suspend.
- after_sleep_cmd = "hyprctl dispatch dpms on"; # to avoid having to press a key twice to turn on the display.
- };
-
- listener = [
- {
- timeout = 150; # 2.5min.
- on-timeout = "brightnessctl -s set 10"; # set monitor backlight to minimum, avoid 0 on OLED monitor.
- on-resume = "brightnessctl -r"; # monitor backlight restore.
- }
- {
- timeout = 300; # 5min
- on-timeout = "loginctl lock-session"; # lock screen when timeout has passed
- }
- {
- timeout = 330; # 5.5min
- on-timeout = "hyprctl dispatch dpms off"; # screen off when timeout has passed
- on-resume = "hyprctl dispatch dpms on && brightnessctl -r"; # screen on when activity is detected after timeout has fired.
- }
- {
- timeout = 1800; # 30min
- on-timeout = "systemctl suspend"; # suspend pc
- }
- ];
-
- };
- };
- };
-
-
-
- programs.wlogout = {
- enable = true;
- layout = [
- {
- "label" = "lock";
- "action" = "hyprlock";
- "text" = "Lock";
- "keybind" = "l";
- }
- {
- "label" = "shutdown";
- "action" = "systemctl poweroff";
- "text" = "Shutdown";
- "keybind" = "s";
- }
- {
- "label" = "suspend";
- "action" = "systemctl suspend";
- "text" = "Suspend";
- "keybind" = "u";
- }
- {
- "label" = "reboot";
- "action" = "systemctl reboot";
- "text" = "Reboot";
- "keybind" = "r";
- }
- {
- "label" = "hibernate";
- "action" = "systemctl hibernate";
- "text" = "Hibernate";
- "keybind" = "h";
- }
- {
- "label" = "reboot";
- "action" = "systemctl reboot";
- "text" = "Reboot";
- "keybind" = "r";
- }
- ];
- };
-
- catppuccin.wlogout.iconStyle = "wleave";
-
- programs.hyprlock = {
- enable = true;
- settings = {
- auth = {
- fingerprint = {
- enabled = true;
- };
- };
-
- background = {
- path = "~/.lock.png";
- color = "$base";
- };
-
- label = {
- monitor = "";
- text = "$TIME";
- color = "$text";
- font_size = 90;
- position = "0, 0";
- halign = "center";
- valign = "top";
- };
-
- input-field = {
- monitor = "";
- size = "300, 60";
- outline_thickness = 4;
- dots_size = 0.2;
- dots_spacing = 0.2;
- dots_center = true;
- outer_color = "$accent";
- inner_color = "$surface0";
- font_color = "$text";
- fade_on_empty = true;
- placeholder_text = '' Logged in as $USER'';
- hide_input = false;
- check_color = "$accent";
- fail_color = "$red";
- fail_text = ''$FAIL ($ATTEMPTS)'';
- capslock_color = "$yellow";
- position = "0, -47";
- halign = "center";
- valign = "center";
- };
- };
- };
-
- catppuccin.hyprlock.enable = true;
- catppuccin.hyprlock.flavor = "mocha";
- catppuccin.hyprlock.accent = "blue";
- catppuccin.hyprlock.useDefaultConfig = false; # we use our own
-}
diff --git a/OLD CONFIGS/system-master_BAK/home/terminal.nix b/OLD CONFIGS/system-master_BAK/home/terminal.nix
deleted file mode 100755
index 203d4d31e..000000000
--- a/OLD CONFIGS/system-master_BAK/home/terminal.nix
+++ /dev/null
@@ -1,21 +0,0 @@
-{
- programs = {
- #
- alacritty = {
- enable = true;
- settings = {
- font.normal.family = "Aporetic Sans Mono";
- font.size = 12;
- terminal.shell.program = "zsh";
-
- window = {
- padding.x = 4;
- padding.y = 4;
- };
- };
- };
- };
-
- catppuccin.alacritty.enable = true;
- catppuccin.alacritty.flavor = "mocha";
-}
diff --git a/OLD CONFIGS/system-master_BAK/home/theme.nix b/OLD CONFIGS/system-master_BAK/home/theme.nix
deleted file mode 100755
index 788b4fda3..000000000
--- a/OLD CONFIGS/system-master_BAK/home/theme.nix
+++ /dev/null
@@ -1,24 +0,0 @@
-{ pkgs, ...}:
-{
- gtk = {
- enable = true;
- colorScheme = "dark";
- theme = {
- name = "Catppuccin-GTK-Grey-Dark-Compact";
- package = (pkgs.magnetic-catppuccin-gtk.override {
- accent = [ "grey" ];
- shade = "dark";
- tweaks = [ "black" ];
- size = "compact";
- });
- };
-
- iconTheme.name = "Papirus-Dark";
- };
-
- catppuccin.enable = true;
- catppuccin.flavor = "mocha";
- catppuccin.accent = "blue";
- catppuccin.gtk.icon.enable = true;
- catppuccin.cursors.enable = true;
-}
diff --git a/OLD CONFIGS/system-master_BAK/home/unity.nix b/OLD CONFIGS/system-master_BAK/home/unity.nix
deleted file mode 100755
index 72995682b..000000000
--- a/OLD CONFIGS/system-master_BAK/home/unity.nix
+++ /dev/null
@@ -1,11 +0,0 @@
-{ pkgs, ... }:
-{
- home.packages = with pkgs; [
- (pkgs.unityhub.override {
- extraPkgs = pkgs: with pkgs; [
- dotnet-sdk
- ];
- })
- ];
-
-}
diff --git a/OLD CONFIGS/system-master_BAK/home/walker.nix b/OLD CONFIGS/system-master_BAK/home/walker.nix
deleted file mode 100755
index bc2319ee4..000000000
--- a/OLD CONFIGS/system-master_BAK/home/walker.nix
+++ /dev/null
@@ -1,9 +0,0 @@
-{
- services.walker.enable = true;
- services.walker.settings = {
- close = "ctrl g";
- next = "ctrl n";
- previous = "ctrl p";
- quick_activate = ["1" "2" "3" "4"];
- };
-}
diff --git a/OLD CONFIGS/system-master_BAK/home/wallpaper.nix b/OLD CONFIGS/system-master_BAK/home/wallpaper.nix
deleted file mode 100755
index feaf53235..000000000
--- a/OLD CONFIGS/system-master_BAK/home/wallpaper.nix
+++ /dev/null
@@ -1,23 +0,0 @@
-{ pkgs, ... }:
-{
- home.packages = with pkgs; [
- hyprpaper
- ];
-
- services.hyprpaper.enable = true;
- services.hyprpaper.settings = {
- ipc = "on";
- splash = false;
- splash_offset = 2.0;
-
- preload = [ "~/.background-image.png" ];
- wallpaper = [ ",~/.background-image.png" ];
- };
-
- home.file = {
- background = {
- source = ../assets/background.png;
- target = ".background-image.png";
- };
- };
-}
diff --git a/OLD CONFIGS/system-master_BAK/home/waybar.nix b/OLD CONFIGS/system-master_BAK/home/waybar.nix
deleted file mode 100755
index 29b0ba724..000000000
--- a/OLD CONFIGS/system-master_BAK/home/waybar.nix
+++ /dev/null
@@ -1,165 +0,0 @@
-{
- programs.waybar = {
- enable = true;
- settings = {
- mainBar = {
- layer = "top";
- height = 34;
- modules-left = [ "hyprland/workspaces" "hyprland/window" ];
- modules-right = [
- "idle_inhibitor"
- "pulseaudio"
- "network"
- "cpu"
- "memory"
- "temperature"
- "battery"
- "tray"
- "clock"
- ];
- "idle_inhibitor" = {
- format = "{icon}";
- format-icons = {
- activated = " ";
- deactivated = " ";
- };
- };
- "pulseaudio" = {
- "format" = "{volume}% {icon}";
- "format-bluetooth" = "{volume}% {icon}";
- "format-muted" = "";
- "format-icons"= {
- "headphones"= "";
- "headset"= "";
- "phone"= "";
- "portab le"= "";
- "default"= ["" ""];
- };
- "on-click"= "pavucontrol";
- };
- "network" = {
- "format-wifi" = " ({bandwidthDownBits})";
- "format-ethernet" = " ({bandwidthDownBits})";
- "format-disconnected" = "Disconnected ⚠";
- "tooltip-format-wifi" = "{essid} ({signalStrength}%)";
- "tooltip-format-ethernet" = "{ifname}: {ipaddr}/{cidr}";
- "on-click" = "impala";
- };
- "cpu".format = "{usage}% ";
- "cpu".tooltip = false;
- "temperature" = {
- "format" = "{temperatureC}°C ";
- };
- "temperature".tooltip = false;
- "tray".spacing = 10;
- "tray".icon-size = 14;
- "clock".format = "{:%a, %d %b %Y - %H:%M}";
- "clock".tooltip = false;
- "battery" = {
- "bat" = "BAT0";
- "states" = {
- "good" = 95;
- "warning" = 30;
- "critical" = 15;
- };
- "format" = "{capacity}% {icon}";
- "format-charging" = "{capacity}% ";
- "format-plugged" = "{capacity}% ";
- "format-icons" = ["" "" "" "" " "];
- };
- "memory".format = "{percentage}% ";
- };
- };
- style = ''
- * {
- font-family: Aporetic Sans Mono, Iosevka Nerd Font, Roboto, Helvetica, Arial, sans-serif;
- font-size: 13px;
- }
-
- window#waybar {
- background-color: @base;
- color: @text;
- transition-property: background-color;
- border-bottom: 0px solid rgba(0, 0, 0, 0);
- transition-duration: .5s;
- }
-
- #workspaces button {
- padding: 0 5px;
- background-color: transparent;
- border: none;
- border-radius: 0;
- color: @text;
- }
-
- #workspaces button:hover {
- background: @surface1;
- color: @text;
- }
-
- #workspaces button.active {
- background-color: @green;
- color: @base;
- box-shadow: inset 0 -3px @subtext1;
- }
-
- #clock,
- #idle_inhibitor
- #battery,
- #cpu,
- #memory,
- #temperature,
- #network,
- #pulseaudio,
- #tray {
- margin: 0 5px;
- padding: 0 2px;
- }
-
- #idle_inhibitor.activated {
- background-color: @green;
- }
-
- #battery.charging {
- color: @green;
- }
-
- @keyframes blink {
- to {
- background-color: #ffffff;
- color: black;
- }
- }
-
- #battery.warning:not(.charging) {
- color: white;
- animation-name: blink;
- animation-duration: 0.5s;
- animation-timing-function: linear;
- animation-iteration-count: infinite;
- animation-direction: alternate;
- }
-
- #window,
- #workspaces {
- margin: 0 4px;
- }
-
- .modules-left > widget:first-child > #workspaces {
- margin-left: 0;
- }
-
- .modules-right > widget:last-child > #workspaces {
- margin-right: 0;
- }
-
- #network.disconnected {
- background-color: @red;
- }
-
- #temperature.critical {
- background-color: @red;
- }
- '';
- };
-}
diff --git a/OLD CONFIGS/system-master_BAK/machines/traveldroid/configuration.nix b/OLD CONFIGS/system-master_BAK/machines/traveldroid/configuration.nix
deleted file mode 100755
index 780e1cd16..000000000
--- a/OLD CONFIGS/system-master_BAK/machines/traveldroid/configuration.nix
+++ /dev/null
@@ -1,44 +0,0 @@
-{ user, ... } : {
- imports =
- [
- ./hardware-configuration.nix
- ../../configuration
- ];
-
- # sops.secrets."ssh/traveldroid/private" = { # ssh private key
- # owner = "${user.username}";
- # mode = "600";
- # path = "/home/${user.username}/.ssh/id_ed25519";
- # };
- # sops.secrets."ssh/traveldroid/public" = { # ssh public key
- # owner = "${user.username}";
- # mode = "644";
- # path = "/home/${user.username}/.ssh/id_ed25519.pub";
- # };
- # sops.secrets."ssh/wavefunk/private" = { # ssh private key
- # owner = "${user.username}";
- # mode = "600";
- # path = "/home/${user.username}/.ssh/wavefunk";
- # };
- # sops.secrets."ssh/wavefunk/public" = { # ssh public key
- # owner = "${user.username}";
- # mode = "644";
- # path = "/home/${user.username}/.ssh/wavefunk.pub";
- # };
- # sops.secrets."ssh/wavefunk_dev/private" = { # ssh private key
- # owner = "${user.username}";
- # mode = "600";
- # path = "/home/${user.username}/.ssh/wavefunk_dev";
- # };
- # sops.secrets."ssh/wavefunk_dev/public" = { # ssh public key
- # owner = "${user.username}";
- # mode = "644";
- # path = "/home/${user.username}/.ssh/wavefunk_dev.pub";
- # };
-
- programs._1password.enable = true;
- programs._1password-gui = {
- enable = true;
- polkitPolicyOwners = [ "${user.username}" ];
- };
-}
diff --git a/OLD CONFIGS/system-master_BAK/machines/traveldroid/hardware-configuration.nix b/OLD CONFIGS/system-master_BAK/machines/traveldroid/hardware-configuration.nix
deleted file mode 100755
index da705c016..000000000
--- a/OLD CONFIGS/system-master_BAK/machines/traveldroid/hardware-configuration.nix
+++ /dev/null
@@ -1,38 +0,0 @@
-{
- hostname,
- pkgs,
- lib,
- modulesPath,
- user,
- config,
- ...
-}:
-{
- imports = [
- (modulesPath + "/installer/scan/not-detected.nix")
- ../../hardware/hardware.nix
- ];
-
-boot.initrd.availableKernelModules = [ "xhci_pci" "nvme" "usb_storage" "sd_mod" "rtsx_usb_sdmmc" ];
-boot.initrd.kernelModules = [ ];
-boot.kernelModules = [ "kvm-intel" ];
-boot.extraModulePackages = [ ];
-
-fileSystems."/" =
- { device = "/dev/disk/by-uuid/69433a14-fbaf-401b-af85-cd1bbf02b4e2";
- fsType = "ext4";
- };
-
-fileSystems."/boot" =
- { device = "/dev/disk/by-uuid/811D-0676";
- fsType = "vfat";
- options = [ "fmask=0077" "dmask=0077" ];
- };
-
-swapDevices =
- [ { device = "/dev/disk/by-uuid/b6c557c2-7682-460b-a5e7-8f6f2f429a3a"; }
- ];
-
-nixpkgs.hostPlatform = lib.mkDefault "x86_64-linux";
-hardware.cpu.intel.updateMicrocode = lib.mkDefault config.hardware.enableRedistributableFirmware;
-}
diff --git a/OLD CONFIGS/system-master_BAK/machines/traveldroid/home.nix b/OLD CONFIGS/system-master_BAK/machines/traveldroid/home.nix
deleted file mode 100755
index 7f5013f9d..000000000
--- a/OLD CONFIGS/system-master_BAK/machines/traveldroid/home.nix
+++ /dev/null
@@ -1,25 +0,0 @@
-{ pkgs, ... } : {
- imports = [
- ../../home
- ];
-
- home.packages = with pkgs; [
- brightnessctl
- ];
-
- wayland.windowManager.hyprland.settings = {
- bind = [
- "XF86MonBrightnessUp, exec, brightnessctl set 5%+"
- "XF86MonBrightnessDown, exec, brightnessctl set 5%-"
- "XF86AudioRaiseVolume, exec, wpctl set-volume @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"
- ];
-
- bindl = [
- '', switch:on:Lid Switch, exec, hyprctl keyword monitor "eDP-1, disable"''
- '', switch:off:Lid Switch, exec, hyprctl keyword monitor "eDP-1, preferred, 0x0, 1"''
- ];
- };
-}
diff --git a/OLD CONFIGS/system-master_BAK/secrets/secrets.yaml b/OLD CONFIGS/system-master_BAK/secrets/secrets.yaml
deleted file mode 100755
index c13bef5f6..000000000
--- a/OLD CONFIGS/system-master_BAK/secrets/secrets.yaml
+++ /dev/null
@@ -1,29 +0,0 @@
-claude_key: ENC[AES256_GCM,data:PMPcEfsKZCALRdgQf5J12k8IsxlNT7R+zfSgmy3LbVhvQQzpCEVr5Xjh6ABhDRGjsTssXc1Vh7FA03oud40i5YxoYwJ2i2EqrRmpp/QNVAfbPrOzfCcwUxlbgJOUEMVv/1RJFYeqddi+bf1F,iv:lD1bRtBtnBf0ub5mGznVuoxLcFcJhxdp+mGv5TMBcKQ=,tag:TP6YLujPHFmFnK5gWwTREg==,type:str]
-gemini_key: ENC[AES256_GCM,data:dqoIwHtS1aIFKSy3NSbJOjJj/s0uc82KX5OQMUXq0RrJ0VNERDl9,iv:hnmYy0Vh8DAxKkDI4aBT/Ustuj8d0ViQk4liSQUrBAo=,tag:dOV6fHRxmfWCcfutE9dt5g==,type:str]
-davfs: ENC[AES256_GCM,data:cVyKjZRwildsaxX8rYVkmPl5YtBRPt2GWPbG4XRuZJcJPnLx4mfGVGlsfhHP+J5U9ThZgNm0mnxxrd4z+4kLzegi4S0bBoqrK1M4lS8Wmk/o4P7UdCSo/+viAyXX+XkWUkBjS4Xl4Q==,iv:dCZtFu/FFCS86nWfBYBjs4V+FgT2wmC4XIPypVXe8lA=,tag:gp9nlD3vHgKF/63wwlfs/g==,type:str]
-davfs_mount: ENC[AES256_GCM,data:NbXq1457Wdlq/49jiJopA9qenwqDCb57lPyHGciucs5cenzdX32nKWoB7hPWj844Vvx9os8jK7WCLEjuA4gedxrl5O5RgYK7bPzZc2EvHUtFlQULvdPCFIceafrJvzmNK4CKytY/K7Ja3FLDj71JjjLXx6yY9GtDbTD2kM+rXTbmSQOil+C4vtkSMFzOW3DQNmpTD154uFdplJJ7xN3z911vzc9UQSER9lCoZl1cRGJcItyy,iv:uP83ZLA2Fxxk3PwFSzce+I7h7+d/zSsejf+i1djDwr8=,tag:s14vRJi7EzCdMhjk6hziSg==,type:str]
-ssh:
- smallbox:
- private: ENC[AES256_GCM,data:YxDFGYAFJzayuxfE5hSXZXuWf8s1yqe/84vhOrrGVOvtuGZV8z63f47YtLwNBsi3zMs23cvygDRYO0SA9QujtNNBSiLff4lnD7T4sMAveSs6IrAu1PH4tYoJPSGnpuml6Llp9D3IjMxKZjYwan8DdJpk6nLLwvl9VjTQa3PJjUPiha866XvBaXWlwkr2sCcihVYE2MAk/ILStNKc2T89ScRXItkAk5fDuCpjlU9RA4g85HthND4NXyW19i7lvHXJHx4zkMyqTUSoPGYpdnCvMi0vvLxPgz/d4y60wtqdKluNaoEWoODFMqOz6082g8thki6wkfl779zcR09ZtSckWPcAkp1sUSjoLvvWFJgcGWcs+BJV7QwagKxNJv6t7tfKfMEPzK4OdFo/HcLt//BEXJtPlQZOd2/soXDKU9oCvGiWwIuzRu7Ynr5bAO+DJJH0BJDJqkapJFSOjiOsxMIz8nQX+XWe3vfKmAW7oq0RvhY63Tl/h3FI4tjU3BzUmE2p1pozq+iLWY9QM9EVevzDooYkqlO25wJqWg3HINMaKoH+i2Y=,iv:g59H/fJm3wukyjchUbB0r3KMxZhhu5k9AX45II2AY0Q=,tag:9wP+A+u3rvGYW9UlBVSVxQ==,type:str]
- public: ENC[AES256_GCM,data:fNnCb06n1/E10PzpaYENaUwPOEM7HN9ndei6r0eaiDyougpk8gyPszhKiObG5Qx9sQjt/KBWSgZkg2YcF65oj8HUK+AWqNuK8wARuxnecwCSXI1lRCflxMX1WuNsDR/2dZ5SDQQo9Q==,iv:JJhWdu4wr5KefTtkkea+dVhLyds03pf1ofDYGXwi/XY=,tag:zT3oRE1EXn4L5odALLTh0Q==,type:str]
- wavefunk:
- private: ENC[AES256_GCM,data:i6KQtOVZviAKIh8U8brH8UCZ6oJLloXzbPvL00j8P/F1ax2kr2ba2F04oGDMlukYhSNca3VIYsoB9BaHxlRJNfLfxcEQPOYPNS7LThl8mR0lLlI8V+zdbxN7hIKlSRI5WttvRGQsPkVjfqkA3SNqpATSESHCI1Y5NuxgyaZXxVVn4PKUSoM+qD50QIJ7np6ghl57UPl9jHOcVvtl7XTJILLaTjzBjlXQsW1txeNMnE2E2AiXDmL7ckBjqmqLQ9Qv3XugOwalBis6ITT2X6sjgApdcargH7GFKyfT+DP+GnjtfRZMkQFTlbdX4Duze5cGkTKOEhzkpM58uDefti5XD64NCBVBJTPSFepzC2BFswigtGur6XlUPbAiU6NVKx3P4MJAfFVUeeNZGRQwz2mQRYSqSaCjw81UmNSSfn+ug04vbHDimTnti1d0lJXEb5Kxre/w5ssHfgwexUWE2HJPNPXDeUGNMl/eqT1IrZ5wegBqrg4OpjVV7bcro4J930FCUDb82o9AIhT9oaMA3zXhKDmKCBIEjp0Ea9EU,iv:PMfGreR0RPjCy3cRRDRp6rjncQD1Ub0d9T8zZjh6Ojk=,tag:LLeMhNUcvHa6qgECEnlBfQ==,type:str]
- public: ENC[AES256_GCM,data:JRiSErA2GbIY95CVYwN1qOk4SsrN9R+f9oxp2SvcuqHtTBw7JYSpPmLmfgVojfazr0X69cZ6D473uj64TuKce2UR6gG4B7KXkXlSFgg6v79zfia1QZhL5GsMlObs+JCU4J0Ipg==,iv:zoad3D+x43rHdM+H5Ql+gOh7yr1P0ZVLLPeiPfNgTH4=,tag:YPA8bC96AzNgssbgftgS9g==,type:str]
- wavefunk_dev:
- private: ENC[AES256_GCM,data:mnCKG4wE98iiX9W+ahD2D/7c6oLty9XUHhUkdE4EkJzSowOiHoJeHGBQrETl39k84YVANPf1VkDiQDjdXsiA5JraXLfVcUKancPSlNDQotrtybngJSSYzFVS3046oMig8+C7RVpcHjbTK6rX1jgfLvUTTsYsdLcsRcQVO5fv6OrZ1rahrvLw+fM2V9g4R+a6K94AaPZqcChzcTCojeUzQBTZhWQUGkH03fps9ZHOp948kUGiURpo7kPEgQUo3KmBl3c9FQ8m0Im8Vs40EjNo6ywcqM4Dlz7fHdiDNVqK013SOMK/Erdo0ItQJWKofpW+XXKUmlt3+bDVGJ5pItrYPIjfu0kHyonE2SR6fqb1XACxXzFMkI3kcZLDr3VdToTufiArmDgPrrW7JNNxTgYCjEuXGOLPQ8VELAKZQwiWxKtR+C1SLrnDvUeHjLwZaQ8L2a9CYYbhT8/0C/zOIOBnaPYKG0Mt/6rpzH36hirtoJoVYU8gZvATfcwSPGeiWABV26/EJEwyPQ7ZertK5Ns0hfJcUw4qLRMwOS58,iv:RxYn4OLLTKPClZYVt2oBHwTkPWndmOtEAfQKUGnAQwc=,tag:eD7eYPeLKlipAjiTvFHivA==,type:str]
- public: ENC[AES256_GCM,data:ZHbpufd2N7B/pMjRrN5jPGvrLPdv5pM9llzN/EUkuBDowCbrU8/sItN04CF7W8+DkrXMxV6Mbcgv3H/LOtBiC/O5ZdDNOGOsDRNwv/YjP23qQ/Tx1YU+hJLnA+jvhTXWyXdj04OT,iv:5aBQSQbrlZT3G6Q+fjdXriDOHuO9WlSaHW7GqnRZ8Ck=,tag:LA5jT5Qqb+ZqrTuPLd1klw==,type:str]
-sops:
- age:
- - recipient: age1yq35g6mmlem0rhr47u6ewh8dctlwp9hj0s0ac60e4hrw9hjzlqms6crf7n
- enc: |
- -----BEGIN AGE ENCRYPTED FILE-----
- YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBnWWRBUlNqZWlqOHlVN3N0
- TjN1YldwRzAxTnBFS25LeUxsREpsUWI5UHlZCmN5aGI2OUFnVXc4aXl1bjltM2Vl
- d3daR1BzMG8ySEhyWWd2SUY4Rm9wRVkKLS0tIHN0L1BuNHl3bXZQSTJmdmkrN3Zz
- cGFUQWlzOCtFWVI0RGIxUm5PbDAyYWMKXYg9uTPFbHuEoe8XPOsV2qgS/ZKCJ9IG
- uwGcQPfvISTENUGS+aw5gRuJY058K9FRdPEq0lXjDaYwAQlb2lVI7A==
- -----END AGE ENCRYPTED FILE-----
- lastmodified: "2025-08-13T11:49:16Z"
- mac: ENC[AES256_GCM,data:4+jPKng5FFuWafNVIXwneC93utapNUvFGe77schDHKxWBT2YowSHRpSizuwS42lY02TRFMHQE8ZLdFmQeuWGY86m/61O52lcYk1cUhHzNyTtITyGiUc0PWMA4NCqmvoXRczmESnvkEMqttzuTS7WC7a2Owq8XvJ3sIUMtGMgxSQ=,iv:Xwc8KnGBt8d7EACSZz6yBNtgop82udot96PUB00JFzI=,tag:K5EF/taRbRo5vXD1zZWiNw==,type:str]
- unencrypted_suffix: _unencrypted
- version: 3.10.2
diff --git a/OLD CONFIGS/system-master_BAK/user.nix b/OLD CONFIGS/system-master_BAK/user.nix
deleted file mode 100755
index 23107be9d..000000000
--- a/OLD CONFIGS/system-master_BAK/user.nix
+++ /dev/null
@@ -1,6 +0,0 @@
-{
- system = "x86_64-linux";
- username = "henrov";
- stateVersion = "25.11";
- locale = "sv_SE.UTF-8";
-}
diff --git a/dendritic-nixos-main/flake.lock b/dendritic-nixos-main/flake.lock
deleted file mode 100644
index 6a6689d7b..000000000
--- a/dendritic-nixos-main/flake.lock
+++ /dev/null
@@ -1,490 +0,0 @@
-{
- "nodes": {
- "base16": {
- "inputs": {
- "fromYaml": "fromYaml"
- },
- "locked": {
- "lastModified": 1755819240,
- "narHash": "sha256-qcMhnL7aGAuFuutH4rq9fvAhCpJWVHLcHVZLtPctPlo=",
- "owner": "SenchoPens",
- "repo": "base16.nix",
- "rev": "75ed5e5e3fce37df22e49125181fa37899c3ccd6",
- "type": "github"
- },
- "original": {
- "owner": "SenchoPens",
- "repo": "base16.nix",
- "type": "github"
- }
- },
- "base16-fish": {
- "flake": false,
- "locked": {
- "lastModified": 1765809053,
- "narHash": "sha256-XCUQLoLfBJ8saWms2HCIj4NEN+xNsWBlU1NrEPcQG4s=",
- "owner": "tomyun",
- "repo": "base16-fish",
- "rev": "86cbea4dca62e08fb7fd83a70e96472f92574782",
- "type": "github"
- },
- "original": {
- "owner": "tomyun",
- "repo": "base16-fish",
- "rev": "86cbea4dca62e08fb7fd83a70e96472f92574782",
- "type": "github"
- }
- },
- "base16-helix": {
- "flake": false,
- "locked": {
- "lastModified": 1760703920,
- "narHash": "sha256-m82fGUYns4uHd+ZTdoLX2vlHikzwzdu2s2rYM2bNwzw=",
- "owner": "tinted-theming",
- "repo": "base16-helix",
- "rev": "d646af9b7d14bff08824538164af99d0c521b185",
- "type": "github"
- },
- "original": {
- "owner": "tinted-theming",
- "repo": "base16-helix",
- "type": "github"
- }
- },
- "base16-vim": {
- "flake": false,
- "locked": {
- "lastModified": 1732806396,
- "narHash": "sha256-e0bpPySdJf0F68Ndanwm+KWHgQiZ0s7liLhvJSWDNsA=",
- "owner": "tinted-theming",
- "repo": "base16-vim",
- "rev": "577fe8125d74ff456cf942c733a85d769afe58b7",
- "type": "github"
- },
- "original": {
- "owner": "tinted-theming",
- "repo": "base16-vim",
- "rev": "577fe8125d74ff456cf942c733a85d769afe58b7",
- "type": "github"
- }
- },
- "firefox-gnome-theme": {
- "flake": false,
- "locked": {
- "lastModified": 1764873433,
- "narHash": "sha256-1XPewtGMi+9wN9Ispoluxunw/RwozuTRVuuQOmxzt+A=",
- "owner": "rafaelmardojai",
- "repo": "firefox-gnome-theme",
- "rev": "f7ffd917ac0d253dbd6a3bf3da06888f57c69f92",
- "type": "github"
- },
- "original": {
- "owner": "rafaelmardojai",
- "repo": "firefox-gnome-theme",
- "type": "github"
- }
- },
- "flake-parts": {
- "inputs": {
- "nixpkgs-lib": "nixpkgs-lib"
- },
- "locked": {
- "lastModified": 1772408722,
- "narHash": "sha256-rHuJtdcOjK7rAHpHphUb1iCvgkU3GpfvicLMwwnfMT0=",
- "owner": "hercules-ci",
- "repo": "flake-parts",
- "rev": "f20dc5d9b8027381c474144ecabc9034d6a839a3",
- "type": "github"
- },
- "original": {
- "owner": "hercules-ci",
- "repo": "flake-parts",
- "type": "github"
- }
- },
- "flake-parts_2": {
- "inputs": {
- "nixpkgs-lib": [
- "stylix",
- "nixpkgs"
- ]
- },
- "locked": {
- "lastModified": 1767609335,
- "narHash": "sha256-feveD98mQpptwrAEggBQKJTYbvwwglSbOv53uCfH9PY=",
- "owner": "hercules-ci",
- "repo": "flake-parts",
- "rev": "250481aafeb741edfe23d29195671c19b36b6dca",
- "type": "github"
- },
- "original": {
- "owner": "hercules-ci",
- "repo": "flake-parts",
- "type": "github"
- }
- },
- "fromYaml": {
- "flake": false,
- "locked": {
- "lastModified": 1731966426,
- "narHash": "sha256-lq95WydhbUTWig/JpqiB7oViTcHFP8Lv41IGtayokA8=",
- "owner": "SenchoPens",
- "repo": "fromYaml",
- "rev": "106af9e2f715e2d828df706c386a685698f3223b",
- "type": "github"
- },
- "original": {
- "owner": "SenchoPens",
- "repo": "fromYaml",
- "type": "github"
- }
- },
- "gnome-shell": {
- "flake": false,
- "locked": {
- "host": "gitlab.gnome.org",
- "lastModified": 1767737596,
- "narHash": "sha256-eFujfIUQDgWnSJBablOuG+32hCai192yRdrNHTv0a+s=",
- "owner": "GNOME",
- "repo": "gnome-shell",
- "rev": "ef02db02bf0ff342734d525b5767814770d85b49",
- "type": "gitlab"
- },
- "original": {
- "host": "gitlab.gnome.org",
- "owner": "GNOME",
- "ref": "gnome-49",
- "repo": "gnome-shell",
- "type": "gitlab"
- }
- },
- "home-manager": {
- "inputs": {
- "nixpkgs": [
- "nixpkgs"
- ]
- },
- "locked": {
- "lastModified": 1773332277,
- "narHash": "sha256-1V+wRrZD9Sw12AQBUWk9CR+XhDZQ8q6yBE0S3Wjbd1M=",
- "owner": "nix-community",
- "repo": "home-manager",
- "rev": "4aeef1941f862fe3a70d1b8264b4e289358c2325",
- "type": "github"
- },
- "original": {
- "owner": "nix-community",
- "repo": "home-manager",
- "type": "github"
- }
- },
- "import-tree": {
- "locked": {
- "lastModified": 1772999353,
- "narHash": "sha256-dPb0WxUhFaz6wuR3B6ysqFJpsu8txKDPZvS47AT2XLI=",
- "owner": "vic",
- "repo": "import-tree",
- "rev": "545a4df146fce44d155573e47f5a777985acf912",
- "type": "github"
- },
- "original": {
- "owner": "vic",
- "repo": "import-tree",
- "type": "github"
- }
- },
- "nixpkgs": {
- "locked": {
- "lastModified": 1773122722,
- "narHash": "sha256-FIqHByVqxCprNjor1NqF80F2QQoiiyqanNNefdlvOg4=",
- "owner": "nixos",
- "repo": "nixpkgs",
- "rev": "62dc67aa6a52b4364dd75994ec00b51fbf474e50",
- "type": "github"
- },
- "original": {
- "owner": "nixos",
- "ref": "nixos-unstable",
- "repo": "nixpkgs",
- "type": "github"
- }
- },
- "nixpkgs-lib": {
- "locked": {
- "lastModified": 1772328832,
- "narHash": "sha256-e+/T/pmEkLP6BHhYjx6GmwP5ivonQQn0bJdH9YrRB+Q=",
- "owner": "nix-community",
- "repo": "nixpkgs.lib",
- "rev": "c185c7a5e5dd8f9add5b2f8ebeff00888b070742",
- "type": "github"
- },
- "original": {
- "owner": "nix-community",
- "repo": "nixpkgs.lib",
- "type": "github"
- }
- },
- "nixpkgs_2": {
- "locked": {
- "lastModified": 1770107345,
- "narHash": "sha256-tbS0Ebx2PiA1FRW8mt8oejR0qMXmziJmPaU1d4kYY9g=",
- "owner": "nixos",
- "repo": "nixpkgs",
- "rev": "4533d9293756b63904b7238acb84ac8fe4c8c2c4",
- "type": "github"
- },
- "original": {
- "owner": "nixos",
- "ref": "nixpkgs-unstable",
- "repo": "nixpkgs",
- "type": "github"
- }
- },
- "noctalia": {
- "inputs": {
- "nixpkgs": [
- "nixpkgs"
- ],
- "noctalia-qs": [
- "noctalia-qs"
- ]
- },
- "locked": {
- "lastModified": 1773350972,
- "narHash": "sha256-zzvM67T3qiTfa5701H1vDfZ3QxTdvKK3eV83V8HQrLo=",
- "owner": "noctalia-dev",
- "repo": "noctalia-shell",
- "rev": "c15fb85c53a39a53e923a866801c48717c6803e7",
- "type": "github"
- },
- "original": {
- "owner": "noctalia-dev",
- "repo": "noctalia-shell",
- "type": "github"
- }
- },
- "noctalia-qs": {
- "inputs": {
- "nixpkgs": [
- "nixpkgs"
- ],
- "systems": "systems",
- "treefmt-nix": "treefmt-nix"
- },
- "locked": {
- "lastModified": 1773277895,
- "narHash": "sha256-pK01O5J9ogI4rVtDI+PVxckaXqpYZ4uthY0vgVWdyl8=",
- "owner": "noctalia-dev",
- "repo": "noctalia-qs",
- "rev": "d5209a6b5fe8c6dff8d530e820c96f09830011e3",
- "type": "github"
- },
- "original": {
- "owner": "noctalia-dev",
- "repo": "noctalia-qs",
- "type": "github"
- }
- },
- "nur": {
- "inputs": {
- "flake-parts": [
- "stylix",
- "flake-parts"
- ],
- "nixpkgs": [
- "stylix",
- "nixpkgs"
- ]
- },
- "locked": {
- "lastModified": 1767810917,
- "narHash": "sha256-ZKqhk772+v/bujjhla9VABwcvz+hB2IaRyeLT6CFnT0=",
- "owner": "nix-community",
- "repo": "NUR",
- "rev": "dead29c804adc928d3a69dfe7f9f12d0eec1f1a4",
- "type": "github"
- },
- "original": {
- "owner": "nix-community",
- "repo": "NUR",
- "type": "github"
- }
- },
- "root": {
- "inputs": {
- "flake-parts": "flake-parts",
- "home-manager": "home-manager",
- "import-tree": "import-tree",
- "nixpkgs": "nixpkgs",
- "noctalia": "noctalia",
- "noctalia-qs": "noctalia-qs",
- "stylix": "stylix"
- }
- },
- "stylix": {
- "inputs": {
- "base16": "base16",
- "base16-fish": "base16-fish",
- "base16-helix": "base16-helix",
- "base16-vim": "base16-vim",
- "firefox-gnome-theme": "firefox-gnome-theme",
- "flake-parts": "flake-parts_2",
- "gnome-shell": "gnome-shell",
- "nixpkgs": [
- "nixpkgs"
- ],
- "nur": "nur",
- "systems": "systems_2",
- "tinted-foot": "tinted-foot",
- "tinted-kitty": "tinted-kitty",
- "tinted-schemes": "tinted-schemes",
- "tinted-tmux": "tinted-tmux",
- "tinted-zed": "tinted-zed"
- },
- "locked": {
- "lastModified": 1772296853,
- "narHash": "sha256-pAtzPsgHRKw/2Kv8HgAjSJg450FDldHPWsP3AKG/Xj0=",
- "owner": "nix-community",
- "repo": "stylix",
- "rev": "c4b8e80a1020e09a1f081ad0f98ce804a6e85acf",
- "type": "github"
- },
- "original": {
- "owner": "nix-community",
- "repo": "stylix",
- "type": "github"
- }
- },
- "systems": {
- "locked": {
- "lastModified": 1689347949,
- "narHash": "sha256-12tWmuL2zgBgZkdoB6qXZsgJEH9LR3oUgpaQq2RbI80=",
- "owner": "nix-systems",
- "repo": "default-linux",
- "rev": "31732fcf5e8fea42e59c2488ad31a0e651500f68",
- "type": "github"
- },
- "original": {
- "owner": "nix-systems",
- "repo": "default-linux",
- "type": "github"
- }
- },
- "systems_2": {
- "locked": {
- "lastModified": 1681028828,
- "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=",
- "owner": "nix-systems",
- "repo": "default",
- "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e",
- "type": "github"
- },
- "original": {
- "owner": "nix-systems",
- "repo": "default",
- "type": "github"
- }
- },
- "tinted-foot": {
- "flake": false,
- "locked": {
- "lastModified": 1726913040,
- "narHash": "sha256-+eDZPkw7efMNUf3/Pv0EmsidqdwNJ1TaOum6k7lngDQ=",
- "owner": "tinted-theming",
- "repo": "tinted-foot",
- "rev": "fd1b924b6c45c3e4465e8a849e67ea82933fcbe4",
- "type": "github"
- },
- "original": {
- "owner": "tinted-theming",
- "repo": "tinted-foot",
- "rev": "fd1b924b6c45c3e4465e8a849e67ea82933fcbe4",
- "type": "github"
- }
- },
- "tinted-kitty": {
- "flake": false,
- "locked": {
- "lastModified": 1735730497,
- "narHash": "sha256-4KtB+FiUzIeK/4aHCKce3V9HwRvYaxX+F1edUrfgzb8=",
- "owner": "tinted-theming",
- "repo": "tinted-kitty",
- "rev": "de6f888497f2c6b2279361bfc790f164bfd0f3fa",
- "type": "github"
- },
- "original": {
- "owner": "tinted-theming",
- "repo": "tinted-kitty",
- "type": "github"
- }
- },
- "tinted-schemes": {
- "flake": false,
- "locked": {
- "lastModified": 1767710407,
- "narHash": "sha256-+W1EB79Jl0/gm4JqmO0Nuc5C7hRdp4vfsV/VdzI+des=",
- "owner": "tinted-theming",
- "repo": "schemes",
- "rev": "2800e2b8ac90f678d7e4acebe4fa253f602e05b2",
- "type": "github"
- },
- "original": {
- "owner": "tinted-theming",
- "repo": "schemes",
- "type": "github"
- }
- },
- "tinted-tmux": {
- "flake": false,
- "locked": {
- "lastModified": 1767489635,
- "narHash": "sha256-e6nnFnWXKBCJjCv4QG4bbcouJ6y3yeT70V9MofL32lU=",
- "owner": "tinted-theming",
- "repo": "tinted-tmux",
- "rev": "3c32729ccae99be44fe8a125d20be06f8d7d8184",
- "type": "github"
- },
- "original": {
- "owner": "tinted-theming",
- "repo": "tinted-tmux",
- "type": "github"
- }
- },
- "tinted-zed": {
- "flake": false,
- "locked": {
- "lastModified": 1767488740,
- "narHash": "sha256-wVOj0qyil8m+ouSsVZcNjl5ZR+1GdOOAooAatQXHbuU=",
- "owner": "tinted-theming",
- "repo": "base16-zed",
- "rev": "11abb0b282ad3786a2aae088d3a01c60916f2e40",
- "type": "github"
- },
- "original": {
- "owner": "tinted-theming",
- "repo": "base16-zed",
- "type": "github"
- }
- },
- "treefmt-nix": {
- "inputs": {
- "nixpkgs": "nixpkgs_2"
- },
- "locked": {
- "lastModified": 1772660329,
- "narHash": "sha256-IjU1FxYqm+VDe5qIOxoW+pISBlGvVApRjiw/Y/ttJzY=",
- "owner": "numtide",
- "repo": "treefmt-nix",
- "rev": "3710e0e1218041bbad640352a0440114b1e10428",
- "type": "github"
- },
- "original": {
- "owner": "numtide",
- "repo": "treefmt-nix",
- "type": "github"
- }
- }
- },
- "root": "root",
- "version": 7
-}
diff --git a/dendritic-nixos-main/flake.nix b/dendritic-nixos-main/flake.nix
deleted file mode 100644
index 5a2127fd5..000000000
--- a/dendritic-nixos-main/flake.nix
+++ /dev/null
@@ -1,43 +0,0 @@
-{
- description = "Dendritic NixOS Configuration";
-
- inputs = {
- nixpkgs.url = "github:nixos/nixpkgs/nixos-unstable";
-
- home-manager = {
- url = "github:nix-community/home-manager";
- inputs.nixpkgs.follows = "nixpkgs";
- };
-
- flake-parts.url = "github:hercules-ci/flake-parts";
- import-tree.url = "github:vic/import-tree";
-
- noctalia = {
- url = "github:noctalia-dev/noctalia-shell";
- inputs.nixpkgs.follows = "nixpkgs";
- inputs.noctalia-qs.follows = "noctalia-qs";
- };
-
- noctalia-qs = {
- url = "github:noctalia-dev/noctalia-qs";
- inputs.nixpkgs.follows = "nixpkgs";
- };
-
- stylix = {
- url = "github:nix-community/stylix";
- inputs.nixpkgs.follows = "nixpkgs";
- };
- };
-
- outputs = inputs@{ flake-parts, import-tree, ... }:
- flake-parts.lib.mkFlake { inherit inputs; } {
- # flake-parts requires you to define systems
- systems = [ "x86_64-linux" ];
-
- imports = [
- (import-tree ./modules) # Auto-loads your features
- ./hosts/nixovm/nixovm.nix # Explicitly loads your grouped host
- ./hosts/omenixos/omenixos.nix
- ];
- };
-}
diff --git a/dendritic-nixos-main/hosts/nixovm/hardware-configuration.nix b/dendritic-nixos-main/hosts/nixovm/hardware-configuration.nix
deleted file mode 100644
index af9478caf..000000000
--- a/dendritic-nixos-main/hosts/nixovm/hardware-configuration.nix
+++ /dev/null
@@ -1,24 +0,0 @@
-# Do not modify this file! It was generated by ‘nixos-generate-config’
-# and may be overwritten by future invocations. Please make changes
-# to /etc/nixos/configuration.nix instead.
-{ config, lib, pkgs, modulesPath, ... }:
-
-{
- imports =
- [ (modulesPath + "/profiles/qemu-guest.nix")
- ];
-
- boot.initrd.availableKernelModules = [ "ahci" "xhci_pci" "virtio_pci" "sr_mod" "virtio_blk" ];
- boot.initrd.kernelModules = [ ];
- boot.kernelModules = [ "kvm-intel" ];
- boot.extraModulePackages = [ ];
-
- fileSystems."/" =
- { device = "/dev/disk/by-uuid/cc3cc0f4-b589-454b-9d73-2707f25952c0";
- fsType = "ext4";
- };
-
- swapDevices = [ ];
-
- nixpkgs.hostPlatform = lib.mkDefault "x86_64-linux";
-}
diff --git a/dendritic-nixos-main/hosts/nixovm/nixovm.nix b/dendritic-nixos-main/hosts/nixovm/nixovm.nix
deleted file mode 100644
index d460c3969..000000000
--- a/dendritic-nixos-main/hosts/nixovm/nixovm.nix
+++ /dev/null
@@ -1,48 +0,0 @@
-# hosts/nixovm/nixovm.nix
-{ inputs, config, ... }:
-
-{
- flake.nixosConfigurations."nixovm" = inputs.nixpkgs.lib.nixosSystem {
- system = "x86_64-linux";
- specialArgs = { inherit inputs; };
-
- modules =
- [
- inputs.home-manager.nixosModules.home-manager
- inputs.stylix.nixosModules.stylix
- ] ++
- (builtins.attrValues config.flake.nixosModules) ++
- [
- ./hardware-configuration.nix
-
- ({ ... }: {
- networking.hostName = "nixovm";
- system.stateVersion = "25.11";
-
- swapDevices = [ {
- device = "/var/lib/swapfile";
- size = 4096; # 4 GB
- } ];
-
- boot.loader.grub.enable = true;
- boot.loader.grub.device = "/dev/vda";
- boot.loader.grub.useOSProber = true;
-
- # Enable various user-defined modules
- mySystem = {
- # Turn on the core system
- system.core.enable = true;
-
- # Enable Apps
- apps.foot.enable = true;
- apps.yazi.enable = true;
-
- # Define Environment
- desktop.hyprland.enable = true;
- desktop.noctalia.enable = true;
- desktop.stylix.enable = true;
- };
- })
- ];
- };
-}
diff --git a/dendritic-nixos-main/hosts/omenixos/hardware-configuration.nix b/dendritic-nixos-main/hosts/omenixos/hardware-configuration.nix
deleted file mode 100644
index 03a37518d..000000000
--- a/dendritic-nixos-main/hosts/omenixos/hardware-configuration.nix
+++ /dev/null
@@ -1,33 +0,0 @@
-# Do not modify this file! It was generated by ‘nixos-generate-config’
-# and may be overwritten by future invocations. Please make changes
-# to /etc/nixos/configuration.nix instead.
-{ config, lib, pkgs, modulesPath, ... }:
-
-{
- imports =
- [ (modulesPath + "/installer/scan/not-detected.nix")
- ];
-
- boot.initrd.availableKernelModules = [ "nvme" "xhci_pci" "ahci" "usbhid" "usb_storage" "sd_mod" ];
- boot.initrd.kernelModules = [ ];
- boot.kernelModules = [ "kvm-amd" ];
- boot.extraModulePackages = [ ];
-
- fileSystems."/" =
- { device = "/dev/disk/by-uuid/ba16b576-efa5-41d6-a61b-30cec1f7d946";
- fsType = "ext4";
- };
-
- fileSystems."/boot" =
- { device = "/dev/disk/by-uuid/6503-E57A";
- fsType = "vfat";
- options = [ "fmask=0077" "dmask=0077" ];
- };
-
- swapDevices =
- [ { device = "/dev/disk/by-uuid/f2bbfa41-0b04-4466-8af7-a68821be0d79"; }
- ];
-
- nixpkgs.hostPlatform = lib.mkDefault "x86_64-linux";
- hardware.cpu.amd.updateMicrocode = lib.mkDefault config.hardware.enableRedistributableFirmware;
-}
diff --git a/dendritic-nixos-main/hosts/omenixos/omenixos.nix b/dendritic-nixos-main/hosts/omenixos/omenixos.nix
deleted file mode 100644
index 3f60fbe51..000000000
--- a/dendritic-nixos-main/hosts/omenixos/omenixos.nix
+++ /dev/null
@@ -1,77 +0,0 @@
-{ inputs, config, ... }:
-
-{
- flake.nixosConfigurations."omenixos" = inputs.nixpkgs.lib.nixosSystem {
- system = "x86_64-linux";
- specialArgs = { inherit inputs; };
-
- modules =
- [
- inputs.home-manager.nixosModules.home-manager
- inputs.stylix.nixosModules.stylix
- ] ++
- (builtins.attrValues config.flake.nixosModules) ++
- [
- ./hardware-configuration.nix
-
- ({ ... }: {
- networking.hostName = "omenixos";
- system.stateVersion = "25.11";
-
- boot = {
- loader = {
- grub = {
- enable = true;
- efiSupport = true;
- device = "nodev";
- useOSProber = true;
- };
-
- efi.canTouchEfiVariables = true;
- };
-
- initrd.systemd.tpm2.enable = false;
- kernelParams = [
- "systemd.mask=dev-tpm0.device"
- "systemd.mask=dev-tpmrm0.device"
- ];
- };
-
- systemd.tpm2.enable = false;
-
-
- # --- 2TB SHARED DRIVE MOUNT ---
- fileSystems."/mnt/shared" = {
- device = "/dev/disk/by-uuid/72925CFC925CC66F";
- fsType = "ntfs3";
- options = [ "rw" "uid=1000" "gid=100" "dmask=0022" "fmask=0133" ];
- };
-
- # Enable various user-defined modules
- mySystem = {
- # Turn on the core system
- system.core.enable = true;
-
- # Hardware-specific modules
- hardware.nvidia.enable = true;
-
- # Enable Apps
- apps = {
- foot.enable = true;
- yazi.enable = true;
- neovim.enable = true;
- fastfetch.enable = true;
- git.enable = true;
- };
-
- # Define Environment
- desktop = {
- hyprland.enable = true;
- noctalia.enable = true;
- stylix.enable = true;
- };
- };
- })
- ];
- };
-}
diff --git a/dendritic-nixos-main/modules/apps/fastfetch.nix b/dendritic-nixos-main/modules/apps/fastfetch.nix
deleted file mode 100644
index dc43c0f3c..000000000
--- a/dendritic-nixos-main/modules/apps/fastfetch.nix
+++ /dev/null
@@ -1,99 +0,0 @@
-{ ... }:
-
-{
- flake.nixosModules.fastfetch = { config, lib, pkgs, ... }:
- let
- cfg = config.mySystem.apps.fastfetch;
- in {
- options.mySystem.apps.fastfetch.enable = lib.mkEnableOption "Personalized Fastfetch";
-
- config = lib.mkIf cfg.enable {
- environment.systemPackages = [ pkgs.fastfetch ];
-
- home-manager.users.shonh.programs.fastfetch = {
- enable = true;
-
- settings = {
- "$schema" = "https://github.com/fastfetch-cli/fastfetch/raw/dev/doc/json_schema.json";
- "logo" = {
- "type" = "small";
- "padding" = {
- "top" = 1;
- "left" = 1;
- };
- };
- "display" = {
- "separator" = " ";
- };
- "modules" = [
- {
- "key" = "╭───────────╮";
- "type" = "custom";
- }
- {
- "key" = "│ {#31} user {#keys}│";
- "type" = "title";
- "format" = "{user-name}";
- }
- {
- "key" = "│ {#32} hname {#keys}│";
- "type" = "title";
- "format" = "{host-name}";
- }
- {
- "key" = "│ {#33} uptime {#keys}│";
- "type" = "uptime";
- }
- {
- "key" = "│ {#34}{icon} distro {#keys}│";
- "type" = "os";
- }
- {
- "key" = "│ {#35} kernel {#keys}│";
- "type" = "kernel";
- }
- {
- "key" = "│ {#36} desktop {#keys}│";
- "type" = "de";
- }
- {
- "key" = "│ {#31} term {#keys}│";
- "type" = "terminal";
- }
- {
- "key" = "│ {#32} shell {#keys}│";
- "type" = "shell";
- }
- {
- "key" = "│ {#33} cpu {#keys}│";
- "type" = "cpu";
- "showPeCoreCount" = true;
- }
- {
- "key" = "│ {#34} disk {#keys}│";
- "type" = "disk";
- "folders" = "/";
- }
- {
- "key" = "│ {#35} memory {#keys}│";
- "type" = "memory";
- }
- {
- "key" = "├───────────┤";
- "type" = "custom";
- }
- {
- "key" = "│ {#39} colors {#keys}│";
- "type" = "colors";
- "symbol" = "circle";
- }
- {
- "key" = "╰───────────╯";
- "type" = "custom";
- }
- ];
- };
- };
- };
- };
-}
diff --git a/dendritic-nixos-main/modules/apps/foot.nix b/dendritic-nixos-main/modules/apps/foot.nix
deleted file mode 100644
index 0bbe26c1b..000000000
--- a/dendritic-nixos-main/modules/apps/foot.nix
+++ /dev/null
@@ -1,54 +0,0 @@
-{ ... }:
-
-{
- flake.nixosModules.foot = { config, lib, pkgs, ... }:
- let
- cfg = config.mySystem.apps.foot;
-
- colors = config.lib.stylix.colors;
- fonts = config.stylix.fonts;
- in {
- options.mySystem.apps.foot.enable = lib.mkEnableOption "Foot Terminal Emulator";
-
- config = lib.mkIf cfg.enable {
- environment.systemPackages = [ pkgs.foot ];
-
- home-manager.users.shonh = {
- stylix.targets.foot.enable = false;
-
- programs.foot = {
- enable = true;
-
- settings = {
- main = {
- term = "xterm-256color";
- dpi-aware = lib.mkForce "yes";
- font = "${fonts.monospace.name}:size=${toString fonts.sizes.terminal}";
- };
-
- colors-dark = {
- background = colors.base00;
- foreground = colors.base05;
- regular0 = colors.base01; # black
- regular1 = colors.base08; # red
- regular2 = colors.base0B; # green
- regular3 = colors.base0A; # yellow
- regular4 = colors.base0D; # blue
- regular5 = colors.base0E; # magenta
- regular6 = colors.base0C; # cyan
- regular7 = colors.base05; # white
- bright0 = colors.base03; # bright black
- bright1 = colors.base08;
- bright2 = colors.base0B;
- bright3 = colors.base0A;
- bright4 = colors.base0D;
- bright5 = colors.base0E;
- bright6 = colors.base0C;
- bright7 = colors.base07;
- };
- };
- };
- };
- };
- };
-}
diff --git a/dendritic-nixos-main/modules/apps/git.nix b/dendritic-nixos-main/modules/apps/git.nix
deleted file mode 100644
index 20582afeb..000000000
--- a/dendritic-nixos-main/modules/apps/git.nix
+++ /dev/null
@@ -1,23 +0,0 @@
-{ ... }:
-
-{
- flake.nixosModules.git = { config, lib, pkgs, ... }:
- let
- cfg = config.mySystem.apps.git;
- in {
- options.mySystem.apps.git.enable = lib.mkEnableOption "Git";
-
- config = lib.mkIf cfg.enable {
- programs.git.enable = true;
-
- home-manager.users.shonh.programs.git = {
- enable = true;
-
- settings.user = {
- name = "Shonhh";
- email = "endinja.versitile@gmail.com";
- };
- };
- };
- };
-}
diff --git a/dendritic-nixos-main/modules/apps/neovim.nix b/dendritic-nixos-main/modules/apps/neovim.nix
deleted file mode 100644
index 2b05cf6fa..000000000
--- a/dendritic-nixos-main/modules/apps/neovim.nix
+++ /dev/null
@@ -1,18 +0,0 @@
-{ ... }:
-
-{
- flake.nixosModules.neovim = { config, lib, pkgs, ... }:
- let
- cfg = config.mySystem.apps.neovim;
- in {
- options.mySystem.apps.neovim.enable = lib.mkEnableOption "Neovim Editor";
-
- config = lib.mkIf cfg.enable {
- programs.neovim.enable = true;
-
- home-manager.users.shonh.programs.neovim = {
- enable = true;
- };
- };
- };
-}
diff --git a/dendritic-nixos-main/modules/apps/yazi.nix b/dendritic-nixos-main/modules/apps/yazi.nix
deleted file mode 100644
index 52f98b728..000000000
--- a/dendritic-nixos-main/modules/apps/yazi.nix
+++ /dev/null
@@ -1,48 +0,0 @@
-# modules/apps/yazi.nix
-{ ... }:
-
-{
- flake.nixosModules.yazi = { config, lib, pkgs, ... }:
- let
- cfg = config.mySystem.apps.yazi;
- in {
- options.mySystem.apps.yazi.enable = lib.mkEnableOption "Yazi File Manager";
-
- config = lib.mkIf cfg.enable {
-
- home-manager.users.shonh = {
-
- home.packages = [ pkgs.ripdrag ];
-
- programs.yazi = {
- enable = true;
- enableBashIntegration = true;
-
- settings = {
- opener = {
- edit = [
- { run = "nvim \"$@\""; block = true; desc = "Neovim"; }
- ];
- };
- open = {
- prepend_rules = [
- { mime = "text/*"; use = "edit"; }
- ];
- };
- };
-
- keymap = {
- mgr.prepend_keymap = [
- {
- on = [ "" ];
- run = "shell 'ripdrag \"$@\" -x 2>/dev/null' --confirm --orphan";
- desc = "Drag and drop selected files";
- }
- ];
- };
- };
-
- };
- };
- };
-}
diff --git a/dendritic-nixos-main/modules/desktop/hyprland.nix b/dendritic-nixos-main/modules/desktop/hyprland.nix
deleted file mode 100644
index e12e999e1..000000000
--- a/dendritic-nixos-main/modules/desktop/hyprland.nix
+++ /dev/null
@@ -1,242 +0,0 @@
-{ ... }:
-
-{
- flake.nixosModules.hyprland = { config, lib, pkgs, ... }:
- let
- cfg = config.mySystem.desktop.hyprland;
- in {
- options.mySystem.desktop.hyprland.enable = lib.mkEnableOption "Hyprland Wayland Compositor";
-
- config = lib.mkIf cfg.enable {
- # --- System Level Setup ---
- programs.hyprland = {
- enable = true;
- withUWSM = true;
- };
-
- # --- User Level Setup
- home-manager.users.shonh = {
- wayland.windowManager.hyprland = {
- enable = true;
- systemd.enable = false;
-
- settings = {
- "$terminal" = "foot";
- "$browser" = "vivaldi";
- "$file-manager" = "foot yazi";
- "$mod" = "SUPER";
-
- "exec-once" = [
- "uwsm app -- noctalia-shell"
- ];
-
- monitor = [
- "Virtual-1,1280x720,auto,1"
- ",highres@highrr,auto,1" # Default
- ];
-
- bind = [
- # Applications
- "$mod, T, exec, uwsm app -- $terminal"
- "$mod, F, exec, uwsm app -- $browser"
- "$mod, E, exec, uwsm app -- $file-manager"
-
- # Desktop Keybinds
- "$mod, Delete, exit,"
- "$mod+Alt, G, exec, ~/nixos/scripts/gamemode.sh"
- "CTRL+ALT, W, exec, noctalia-shell kill || uwsm app -- noctalia-shell"
- "$mod, A, exec, noctalia-shell ipc call launcher toggle"
- "$mod, Q, killactive,"
- "$mod, W, togglefloating,"
- "$mod+SHIFT, F, fullscreen"
- "$mod, J, togglesplit," # dwindle
-
- # Move focus with mod + arrow keys
- "$mod, left, movefocus, l"
- "$mod, right, movefocus, r"
- "$mod, up, movefocus, u"
- "$mod, down, movefocus, d"
-
- # Handling Workspaces
- "$mod, 0, workspace, 10"
- "$mod SHIFT, 0, movetoworkspace, 10"
- "$mod, code:36, togglespecialworkspace, terminal"
-
- # Scroll through existing workspaces with $mod + scroll
- "$mod, mouse_down, workspace, e+1"
- "$mod, mouse_up, workspace, e-1"
- ]
- ++ (
- # Binds $mod + [shift +] {1..9} to [move to] workspace {1..9}
- builtins.concatLists (
- builtins.genList (
- i:
- let
- ws = i + 1;
- in
- [
- "$mod, code:1${toString i}, workspace, ${toString ws}"
- "$mod SHIFT, code:1${toString i}, movetoworkspace, ${toString ws}"
- ]
- ) 9
- )
- );
-
- bindm = [
- "$mod, Z, movewindow"
- "$mod, X, resizewindow"
-
- "$mod, mouse:272, movewindow"
- "$mod, mouse:273, resizewindow"
- ];
-
- # Laptop multimedia keys for volume and LCD brightness
- bindel = [
- ",XF86AudioRaiseVolume, exec, wpctl set-volume @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, brightnessctl s 5%+"
- ",XF86MonBrightnessDown, exec, brightnessctl s 5%-"
- ];
-
- bindl = [
- ", XF86AudioNext, exec, playerctl next"
- ", XF86AudioPause, exec, playerctl play-pause"
- ", XF86AudioPlay, exec, playerctl play-pause"
- ", XF86AudioPrev, exec, playerctl previous"
- ];
-
- # General
- general = {
- gaps_in = 3;
- gaps_out = 8;
-
- border_size = 2;
-
- resize_on_border = true;
-
- allow_tearing = false;
- layout = "dwindle";
- };
-
- # Decoration
- decoration = {
- rounding = 7;
- active_opacity = 1.0;
- inactive_opacity = 1.0;
-
- blur = {
- enabled = true;
- size = 5;
- passes = 3;
- new_optimizations = "on";
- ignore_opacity = "on";
- xray = false;
- };
- };
-
- windowrule = [
- # Opacity Rules
- "match:class ^($terminal)$, opacity 0.80 0.80"
- ];
-
- workspace = [
- "10, border:false, rounding:false"
- "special:terminal, on-created-empty:[float; size 960 540] $terminal, persistent:false"
- ];
-
- gesture = [
- "3, horizontal, workspace"
- ];
-
- # Layout configuration
- dwindle = {
- pseudotile = true;
- preserve_split = true;
- };
-
- master = {
- new_status = "master";
- };
-
- # Miscellaneous
- misc = {
- force_default_wallpaper = 0;
- disable_hyprland_logo = true;
- };
-
- # Input
- input = {
- kb_layout = "us";
-
- follow_mouse = 1;
- sensitivity = 0.30;
- scroll_factor = 0.5;
- accel_profile = "flat";
- emulate_discrete_scroll = 0;
-
- touchpad = {
- disable_while_typing = false;
- natural_scroll = true;
- scroll_factor = 0.15;
- };
- };
-
- cursor = {
- no_hardware_cursors = 1;
- };
-
- device = [
- {
- # ... add later
- }
- ];
-
- # Animations
- animations = {
- enabled = true;
-
- bezier = [
- "wind, 0.05, 0.85, 0.03, 0.97"
- "winIn, 0.07, 0.88, 0.04, 0.99"
- "winOut, 0.20, -0.15, 0, 1"
- "liner, 1, 1, 1, 1"
- "md3_standard, 0.12, 0, 0, 1"
- "md3_decel, 0.05, 0.80, 0.10, 0.97"
- "md3_accel, 0.20, 0, 0.80, 0.08"
- "overshot, 0.05, 0.85, 0.07, 1.04"
- "crazyshot, 0.1, 1.22, 0.68, 0.98"
- "hyprnostretch, 0.05, 0.82, 0, 1"
- "menu_decel, 0.05, 0.82, 0, 1"
- "menu_accel, 0.20, 0, 0.82, 0.10"
- "easeInOutCirc, 0.78, 0, 0.15, 1"
- "easeOutCirc, 0, 0.48, 0.38, 1"
- "easeOutExpo, 0.10, 0.94, 0.23, 0.98"
- "softAcDecel, 0.20, 0.20, 0.15, 1"
- "md2, 0.30, 0, 0.15, 1"
-
- "OutBack, 0.28, 1.40, 0.58, 1"
- ];
-
- animation = [
- "border, 1, 1.6, liner"
- "borderangle, 1, 82, liner, once"
- "windowsIn, 1, 3.2, winIn, slide"
- "windowsOut, 1, 2.8, easeOutCirc"
- "windowsMove, 1, 3.0, wind, slide"
- "fade, 1, 1.8, md3_decel"
- "layersIn, 1, 1.8, menu_decel, slide"
- "layersOut, 1, 1.5, menu_accel"
- "fadeLayersIn, 1, 1.6, menu_decel"
- "fadeLayersOut, 1, 1.8, menu_accel"
- "workspaces, 1, 4.0, menu_decel, slide"
- "specialWorkspace, 1, 2.3, md3_decel, slidefadevert 15%"
- ];
- };
- };
- };
- };
- };
- };
-}
diff --git a/dendritic-nixos-main/modules/desktop/noctalia.nix b/dendritic-nixos-main/modules/desktop/noctalia.nix
deleted file mode 100644
index 7f324350f..000000000
--- a/dendritic-nixos-main/modules/desktop/noctalia.nix
+++ /dev/null
@@ -1,26 +0,0 @@
-# modules/desktop/noctalia.nix
-{ ... }:
-
-{
- flake.nixosModules.noctalia = { config, lib, pkgs, inputs, ... }:
- let
- cfg = config.mySystem.desktop.noctalia;
- in {
- options.mySystem.desktop.noctalia.enable = lib.mkEnableOption "Noctalia Shell";
-
- config = lib.mkIf cfg.enable {
-
- # Noctalia needs these background services to read battery and hardware data
- mySystem.system.power-management.enable = true;
- mySystem.hardware.bluetooth.enable = true;
-
- home-manager.users.shonh = {
- imports = [ inputs.noctalia.homeModules.default ];
-
- programs.noctalia-shell = {
- enable = true;
- };
- };
- };
- };
-}
diff --git a/dendritic-nixos-main/modules/desktop/stylix.nix b/dendritic-nixos-main/modules/desktop/stylix.nix
deleted file mode 100644
index dd71250e5..000000000
--- a/dendritic-nixos-main/modules/desktop/stylix.nix
+++ /dev/null
@@ -1,52 +0,0 @@
-{ ... }:
-
-{
- flake.nixosModules.stylix = { inputs, config, lib, pkgs, ... }:
- let
- cfg = config.mySystem.desktop.stylix;
- in {
- options.mySystem.desktop.stylix.enable = lib.mkEnableOption "Stylix System Theming";
-
- config = lib.mkIf cfg.enable {
- stylix = {
- enable = true;
-
- image = inputs.self + "/wallpapers/wallpaper1.jpg";
- polarity = "dark";
-
- cursor = {
- package = pkgs.phinger-cursors;
- name = "phinger-cursors-light";
- size = 24;
- };
-
- fonts = {
- monospace = {
- package = pkgs.nerd-fonts.fira-code;
- name = "Fira Code Nerd Font";
- };
-
- sansSerif = {
- package = pkgs.lato;
- name = "Lato";
- };
- };
-
- icons = {
- enable = true;
- package = pkgs.papirus-icon-theme;
-
- dark = "Papirus-Dark";
- light = "Papirus-Light";
- };
- };
-
- home-manager.users.shonh.home.sessionVariables = {
- XCURSOR_THEME = config.stylix.cursor.name;
- XCURSOR_SIZE = toString config.stylix.cursor.size;
- HYPRCURSOR_THEME = config.stylix.cursor.name;
- HYPRCURSOR_SIZE = toString config.stylix.cursor.size;
- };
- };
- };
-}
diff --git a/dendritic-nixos-main/modules/hardware/bluetooth.nix b/dendritic-nixos-main/modules/hardware/bluetooth.nix
deleted file mode 100644
index 62db5d73b..000000000
--- a/dendritic-nixos-main/modules/hardware/bluetooth.nix
+++ /dev/null
@@ -1,18 +0,0 @@
-{ ... }:
-{
- flake.nixosModules.bluetooth = { config, lib, pkgs, ... }:
- let
- cfg = config.mySystem.hardware.bluetooth;
- in {
- options.mySystem.hardware.bluetooth.enable = lib.mkEnableOption "Bluetooth Support";
-
- config = lib.mkIf cfg.enable {
- hardware.bluetooth.enable = true;
- hardware.bluetooth.powerOnBoot = true;
-
- environment.systemPackages = [
- pkgs.bluetui
- ];
- };
- };
-}
diff --git a/dendritic-nixos-main/modules/hardware/nvidia.nix b/dendritic-nixos-main/modules/hardware/nvidia.nix
deleted file mode 100644
index b2a636c80..000000000
--- a/dendritic-nixos-main/modules/hardware/nvidia.nix
+++ /dev/null
@@ -1,50 +0,0 @@
-{ ... }:
-
-{
- flake.nixosModules.nvidia = { config, lib, pkgs, ... }:
- let
- cfg = config.mySystem.hardware.nvidia;
- in {
- options.mySystem.hardware.nvidia.enable = lib.mkEnableOption "NVIDIA Drivers and Wayland Fixes";
-
- config = lib.mkIf cfg.enable {
-
- # 1. Enable OpenGL / Graphics Support
- hardware.graphics = {
- enable = true;
- enable32Bit = true; # Crucial for 32-bit games (like older Terraria versions/mods)
-
- extraPackages = with pkgs; [
- nvidia-vaapi-driver
- ];
- };
-
- # 2. Tell X11/Wayland to use the Nvidia driver
- services.xserver.videoDrivers = [ "nvidia" ];
-
- # 3. Configure the Nvidia package
- hardware.nvidia = {
- modesetting.enable = true;
-
- powerManagement.enable = false;
- powerManagement.finegrained = false;
-
- open = false;
- nvidiaSettings = true;
- package = config.boot.kernelPackages.nvidiaPackages.stable;
- };
-
- # 4. Inject Wayland variables into UWSM to force NVIDIA hardware acceleration
- home-manager.users.shonh = {
- home.sessionVariables = {
- LIBVA_DRIVER_NAME = "nvidia";
- XDG_SESSION_TYPE = "wayland";
- __GLX_VENDOR_LIBRARY_NAME = "nvidia";
- NVD_BACKEND = "direct"; # Fixes graphical glitches in Electron/Chromium apps
-
- NIXOS_OZONE_WL = "1";
- };
- };
- };
- };
-}
diff --git a/dendritic-nixos-main/modules/system/core.nix b/dendritic-nixos-main/modules/system/core.nix
deleted file mode 100644
index 91adc4f17..000000000
--- a/dendritic-nixos-main/modules/system/core.nix
+++ /dev/null
@@ -1,92 +0,0 @@
-{ ... }:
-
-{
- flake.nixosModules.core = { config, lib, pkgs, ... }:
-let
- cfg = config.mySystem.system.core;
-in {
- options.mySystem.system.core.enable = lib.mkEnableOption "Core System Settings";
-
- config = lib.mkIf cfg.enable {
-
- # --- Flakes & Nix Settings ---
- nix.settings = {
- experimental-features = [ "nix-command" "flakes" ];
- download-buffer-size = 536870912; # 512 MB
- cores = 2;
- max-jobs = 1;
- };
-
- nixpkgs.config.allowUnfree = true;
-
- # --- Kernel ---
- boot.kernelPackages = pkgs.linuxPackages_latest;
-
- # --- Networking ---
- networking.networkmanager.enable = true;
-
- # --- Time & Locale ---
- time.timeZone = "America/Chicago";
- i18n.defaultLocale = "en_US.UTF-8";
- i18n.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";
- };
-
- # --- X11 & Login Manager ---
- services.xserver.enable = true;
- mySystem.system.login-manager.enable = true;
- services.xserver.xkb = {
- layout = "us";
- variant = "";
- };
-
- # --- Services (Printing & Audio) ---
- services.printing.enable = true;
- services.pulseaudio.enable = false;
- security.rtkit.enable = true;
- services.pipewire = {
- enable = true;
- alsa.enable = true;
- alsa.support32Bit = true;
- pulse.enable = true;
- };
-
- # --- User Account ---
- users.users.shonh = {
- isNormalUser = true;
- description = "Shonh";
- extraGroups = [ "networkmanager" "wheel" ];
- };
-
- # --- Home Manager Base ---
- home-manager = {
- backupFileExtension = "backup";
-
- users.shonh = {
- home.sessionVariables = {
- TERMINAL = "foot";
- EDITOR = "nvim";
- BROWSER = "vivaldi";
- };
-
- home.stateVersion = "25.11";
- };
- };
-
- # --- Base Applications ---
- environment.systemPackages = with pkgs; [
- tree
- sl
- vivaldi
- ];
- };
- };
-}
diff --git a/dendritic-nixos-main/modules/system/login-manager.nix b/dendritic-nixos-main/modules/system/login-manager.nix
deleted file mode 100644
index 4d0e78570..000000000
--- a/dendritic-nixos-main/modules/system/login-manager.nix
+++ /dev/null
@@ -1,22 +0,0 @@
-{ ... }:
-
-{
- flake.nixosModules.login-manager = { config, lib, pkgs, ... }:
- let
- cfg = config.mySystem.system.login-manager;
- in {
- options.mySystem.system.login-manager.enable = lib.mkEnableOption "TuiGreetd Login Manager";
-
- config = lib.mkIf cfg.enable {
- services.greetd = {
- enable = true;
- settings = {
- default_session = {
- command = "${pkgs.tuigreet}/bin/tuigreet -t --user-menu -r --remember-session --asterisks --sessions ${config.services.displayManager.sessionData.desktops}/share/wayland-sessions";
- user = "greeter";
- };
- };
- };
- };
- };
-}
diff --git a/dendritic-nixos-main/modules/system/power-management.nix b/dendritic-nixos-main/modules/system/power-management.nix
deleted file mode 100644
index 3309b1dfa..000000000
--- a/dendritic-nixos-main/modules/system/power-management.nix
+++ /dev/null
@@ -1,18 +0,0 @@
-{ ... }:
-
-{
- # Push the configuration into the Flake's module pool
- flake.nixosModules.bluetooth = { config, lib, pkgs, ... }:
- let
- cfg = config.mySystem.system.power-management;
- in {
- # 1. Define the custom toggle
- options.mySystem.system.power-management.enable = lib.mkEnableOption "Power Management/Profiles";
-
- # 2. Apply the configuration
- config = lib.mkIf cfg.enable {
- services.upower.enable = true;
- services.power-profiles-daemon.enable = true;
- };
- };
-}
diff --git a/dendritic-nixos-main/scripts/gamemode.sh b/dendritic-nixos-main/scripts/gamemode.sh
deleted file mode 100755
index 0e5b8292b..000000000
--- a/dendritic-nixos-main/scripts/gamemode.sh
+++ /dev/null
@@ -1,16 +0,0 @@
-#!/usr/bin/env sh
-HYPRGAMEMODE=$(hyprctl getoption animations:enabled | awk 'NR==1{print $2}')
-if [ "$HYPRGAMEMODE" = 1 ] ; then
- hyprctl --batch "\
- keyword animations:enabled 0;\
- keyword decoration:shadow:enabled 0;\
- keyword decoration:blur:enabled 0;\
- keyword general:gaps_in 0;\
- keyword general:gaps_out 0;\
- keyword general:border_size 1;\
- keyword decoration:rounding 0"
- noctalia-shell ipc call powerProfile enableNoctaliaPerformance
- exit
-fi
-hyprctl reload
-noctalia-shell ipc call powerProfile disableNoctaliaPerformance
diff --git a/dendritic-nixos-main/wallpapers/wallpaper.jpg b/dendritic-nixos-main/wallpapers/wallpaper.jpg
deleted file mode 100644
index 7eb3c32b0..000000000
Binary files a/dendritic-nixos-main/wallpapers/wallpaper.jpg and /dev/null differ
diff --git a/dendritic-nixos-main/wallpapers/wallpaper.webp b/dendritic-nixos-main/wallpapers/wallpaper.webp
deleted file mode 100644
index 8a637210a..000000000
Binary files a/dendritic-nixos-main/wallpapers/wallpaper.webp and /dev/null differ
diff --git a/dendritic-nixos-main/wallpapers/wallpaper1.jpg b/dendritic-nixos-main/wallpapers/wallpaper1.jpg
deleted file mode 100644
index 88807c2e6..000000000
Binary files a/dendritic-nixos-main/wallpapers/wallpaper1.jpg and /dev/null differ
diff --git a/dendritic-nixos-main/wallpapers/wallpaper1.png b/dendritic-nixos-main/wallpapers/wallpaper1.png
deleted file mode 100644
index 0b39c31b5..000000000
Binary files a/dendritic-nixos-main/wallpapers/wallpaper1.png and /dev/null differ
diff --git a/dendritic-nixos-main/wallpapers/wallpaper2.png b/dendritic-nixos-main/wallpapers/wallpaper2.png
deleted file mode 100644
index a1e35cf0b..000000000
Binary files a/dendritic-nixos-main/wallpapers/wallpaper2.png and /dev/null differ
diff --git a/henrovnix_ok/.envrc b/henrovnix_ok/.envrc
deleted file mode 100755
index 5370a3ad1..000000000
--- a/henrovnix_ok/.envrc
+++ /dev/null
@@ -1,6 +0,0 @@
-use flake
-
-watch_file .envrc.private
-if [[ -f .envrc.private ]]; then
-source_env .envrc.private
-fi
diff --git a/henrovnix_ok/.gitignore b/henrovnix_ok/.gitignore
deleted file mode 100755
index 38f3b1268..000000000
--- a/henrovnix_ok/.gitignore
+++ /dev/null
@@ -1,4 +0,0 @@
-/.direnv/
-*.md
-/.envrc-private
-/.envrc.private
diff --git a/henrovnix_ok/LICENSE b/henrovnix_ok/LICENSE
deleted file mode 100755
index f288702d2..000000000
--- a/henrovnix_ok/LICENSE
+++ /dev/null
@@ -1,674 +0,0 @@
- GNU GENERAL PUBLIC LICENSE
- Version 3, 29 June 2007
-
- Copyright (C) 2007 Free Software Foundation, Inc.
- Everyone is permitted to copy and distribute verbatim copies
- of this license document, but changing it is not allowed.
-
- Preamble
-
- The GNU General Public License is a free, copyleft license for
-software and other kinds of works.
-
- The licenses for most software and other practical works are designed
-to take away your freedom to share and change the works. By contrast,
-the GNU General Public License is intended to guarantee your freedom to
-share and change all versions of a program--to make sure it remains free
-software for all its users. We, the Free Software Foundation, use the
-GNU General Public License for most of our software; it applies also to
-any other work released this way by its authors. You can apply it to
-your programs, too.
-
- When we speak of free software, we are referring to freedom, not
-price. Our General Public Licenses are designed to make sure that you
-have the freedom to distribute copies of free software (and charge for
-them if you wish), that you receive source code or can get it if you
-want it, that you can change the software or use pieces of it in new
-free programs, and that you know you can do these things.
-
- To protect your rights, we need to prevent others from denying you
-these rights or asking you to surrender the rights. Therefore, you have
-certain responsibilities if you distribute copies of the software, or if
-you modify it: responsibilities to respect the freedom of others.
-
- For example, if you distribute copies of such a program, whether
-gratis or for a fee, you must pass on to the recipients the same
-freedoms that you received. You must make sure that they, too, receive
-or can get the source code. And you must show them these terms so they
-know their rights.
-
- Developers that use the GNU GPL protect your rights with two steps:
-(1) assert copyright on the software, and (2) offer you this License
-giving you legal permission to copy, distribute and/or modify it.
-
- For the developers' and authors' protection, the GPL clearly explains
-that there is no warranty for this free software. For both users' and
-authors' sake, the GPL requires that modified versions be marked as
-changed, so that their problems will not be attributed erroneously to
-authors of previous versions.
-
- Some devices are designed to deny users access to install or run
-modified versions of the software inside them, although the manufacturer
-can do so. This is fundamentally incompatible with the aim of
-protecting users' freedom to change the software. The systematic
-pattern of such abuse occurs in the area of products for individuals to
-use, which is precisely where it is most unacceptable. Therefore, we
-have designed this version of the GPL to prohibit the practice for those
-products. If such problems arise substantially in other domains, we
-stand ready to extend this provision to those domains in future versions
-of the GPL, as needed to protect the freedom of users.
-
- Finally, every program is threatened constantly by software patents.
-States should not allow patents to restrict development and use of
-software on general-purpose computers, but in those that do, we wish to
-avoid the special danger that patents applied to a free program could
-make it effectively proprietary. To prevent this, the GPL assures that
-patents cannot be used to render the program non-free.
-
- The precise terms and conditions for copying, distribution and
-modification follow.
-
- TERMS AND CONDITIONS
-
- 0. Definitions.
-
- "This License" refers to version 3 of the GNU General Public License.
-
- "Copyright" also means copyright-like laws that apply to other kinds of
-works, such as semiconductor masks.
-
- "The Program" refers to any copyrightable work licensed under this
-License. Each licensee is addressed as "you". "Licensees" and
-"recipients" may be individuals or organizations.
-
- To "modify" a work means to copy from or adapt all or part of the work
-in a fashion requiring copyright permission, other than the making of an
-exact copy. The resulting work is called a "modified version" of the
-earlier work or a work "based on" the earlier work.
-
- A "covered work" means either the unmodified Program or a work based
-on the Program.
-
- To "propagate" a work means to do anything with it that, without
-permission, would make you directly or secondarily liable for
-infringement under applicable copyright law, except executing it on a
-computer or modifying a private copy. Propagation includes copying,
-distribution (with or without modification), making available to the
-public, and in some countries other activities as well.
-
- To "convey" a work means any kind of propagation that enables other
-parties to make or receive copies. Mere interaction with a user through
-a computer network, with no transfer of a copy, is not conveying.
-
- An interactive user interface displays "Appropriate Legal Notices"
-to the extent that it includes a convenient and prominently visible
-feature that (1) displays an appropriate copyright notice, and (2)
-tells the user that there is no warranty for the work (except to the
-extent that warranties are provided), that licensees may convey the
-work under this License, and how to view a copy of this License. If
-the interface presents a list of user commands or options, such as a
-menu, a prominent item in the list meets this criterion.
-
- 1. Source Code.
-
- The "source code" for a work means the preferred form of the work
-for making modifications to it. "Object code" means any non-source
-form of a work.
-
- A "Standard Interface" means an interface that either is an official
-standard defined by a recognized standards body, or, in the case of
-interfaces specified for a particular programming language, one that
-is widely used among developers working in that language.
-
- The "System Libraries" of an executable work include anything, other
-than the work as a whole, that (a) is included in the normal form of
-packaging a Major Component, but which is not part of that Major
-Component, and (b) serves only to enable use of the work with that
-Major Component, or to implement a Standard Interface for which an
-implementation is available to the public in source code form. A
-"Major Component", in this context, means a major essential component
-(kernel, window system, and so on) of the specific operating system
-(if any) on which the executable work runs, or a compiler used to
-produce the work, or an object code interpreter used to run it.
-
- The "Corresponding Source" for a work in object code form means all
-the source code needed to generate, install, and (for an executable
-work) run the object code and to modify the work, including scripts to
-control those activities. However, it does not include the work's
-System Libraries, or general-purpose tools or generally available free
-programs which are used unmodified in performing those activities but
-which are not part of the work. For example, Corresponding Source
-includes interface definition files associated with source files for
-the work, and the source code for shared libraries and dynamically
-linked subprograms that the work is specifically designed to require,
-such as by intimate data communication or control flow between those
-subprograms and other parts of the work.
-
- The Corresponding Source need not include anything that users
-can regenerate automatically from other parts of the Corresponding
-Source.
-
- The Corresponding Source for a work in source code form is that
-same work.
-
- 2. Basic Permissions.
-
- All rights granted under this License are granted for the term of
-copyright on the Program, and are irrevocable provided the stated
-conditions are met. This License explicitly affirms your unlimited
-permission to run the unmodified Program. The output from running a
-covered work is covered by this License only if the output, given its
-content, constitutes a covered work. This License acknowledges your
-rights of fair use or other equivalent, as provided by copyright law.
-
- You may make, run and propagate covered works that you do not
-convey, without conditions so long as your license otherwise remains
-in force. You may convey covered works to others for the sole purpose
-of having them make modifications exclusively for you, or provide you
-with facilities for running those works, provided that you comply with
-the terms of this License in conveying all material for which you do
-not control copyright. Those thus making or running the covered works
-for you must do so exclusively on your behalf, under your direction
-and control, on terms that prohibit them from making any copies of
-your copyrighted material outside their relationship with you.
-
- Conveying under any other circumstances is permitted solely under
-the conditions stated below. Sublicensing is not allowed; section 10
-makes it unnecessary.
-
- 3. Protecting Users' Legal Rights From Anti-Circumvention Law.
-
- No covered work shall be deemed part of an effective technological
-measure under any applicable law fulfilling obligations under article
-11 of the WIPO copyright treaty adopted on 20 December 1996, or
-similar laws prohibiting or restricting circumvention of such
-measures.
-
- When you convey a covered work, you waive any legal power to forbid
-circumvention of technological measures to the extent such circumvention
-is effected by exercising rights under this License with respect to
-the covered work, and you disclaim any intention to limit operation or
-modification of the work as a means of enforcing, against the work's
-users, your or third parties' legal rights to forbid circumvention of
-technological measures.
-
- 4. Conveying Verbatim Copies.
-
- You may convey verbatim copies of the Program's source code as you
-receive it, in any medium, provided that you conspicuously and
-appropriately publish on each copy an appropriate copyright notice;
-keep intact all notices stating that this License and any
-non-permissive terms added in accord with section 7 apply to the code;
-keep intact all notices of the absence of any warranty; and give all
-recipients a copy of this License along with the Program.
-
- You may charge any price or no price for each copy that you convey,
-and you may offer support or warranty protection for a fee.
-
- 5. Conveying Modified Source Versions.
-
- You may convey a work based on the Program, or the modifications to
-produce it from the Program, in the form of source code under the
-terms of section 4, provided that you also meet all of these conditions:
-
- a) The work must carry prominent notices stating that you modified
- it, and giving a relevant date.
-
- b) The work must carry prominent notices stating that it is
- released under this License and any conditions added under section
- 7. This requirement modifies the requirement in section 4 to
- "keep intact all notices".
-
- c) You must license the entire work, as a whole, under this
- License to anyone who comes into possession of a copy. This
- License will therefore apply, along with any applicable section 7
- additional terms, to the whole of the work, and all its parts,
- regardless of how they are packaged. This License gives no
- permission to license the work in any other way, but it does not
- invalidate such permission if you have separately received it.
-
- d) If the work has interactive user interfaces, each must display
- Appropriate Legal Notices; however, if the Program has interactive
- interfaces that do not display Appropriate Legal Notices, your
- work need not make them do so.
-
- A compilation of a covered work with other separate and independent
-works, which are not by their nature extensions of the covered work,
-and which are not combined with it such as to form a larger program,
-in or on a volume of a storage or distribution medium, is called an
-"aggregate" if the compilation and its resulting copyright are not
-used to limit the access or legal rights of the compilation's users
-beyond what the individual works permit. Inclusion of a covered work
-in an aggregate does not cause this License to apply to the other
-parts of the aggregate.
-
- 6. Conveying Non-Source Forms.
-
- You may convey a covered work in object code form under the terms
-of sections 4 and 5, provided that you also convey the
-machine-readable Corresponding Source under the terms of this License,
-in one of these ways:
-
- a) Convey the object code in, or embodied in, a physical product
- (including a physical distribution medium), accompanied by the
- Corresponding Source fixed on a durable physical medium
- customarily used for software interchange.
-
- b) Convey the object code in, or embodied in, a physical product
- (including a physical distribution medium), accompanied by a
- written offer, valid for at least three years and valid for as
- long as you offer spare parts or customer support for that product
- model, to give anyone who possesses the object code either (1) a
- copy of the Corresponding Source for all the software in the
- product that is covered by this License, on a durable physical
- medium customarily used for software interchange, for a price no
- more than your reasonable cost of physically performing this
- conveying of source, or (2) access to copy the
- Corresponding Source from a network server at no charge.
-
- c) Convey individual copies of the object code with a copy of the
- written offer to provide the Corresponding Source. This
- alternative is allowed only occasionally and noncommercially, and
- only if you received the object code with such an offer, in accord
- with subsection 6b.
-
- d) Convey the object code by offering access from a designated
- place (gratis or for a charge), and offer equivalent access to the
- Corresponding Source in the same way through the same place at no
- further charge. You need not require recipients to copy the
- Corresponding Source along with the object code. If the place to
- copy the object code is a network server, the Corresponding Source
- may be on a different server (operated by you or a third party)
- that supports equivalent copying facilities, provided you maintain
- clear directions next to the object code saying where to find the
- Corresponding Source. Regardless of what server hosts the
- Corresponding Source, you remain obligated to ensure that it is
- available for as long as needed to satisfy these requirements.
-
- e) Convey the object code using peer-to-peer transmission, provided
- you inform other peers where the object code and Corresponding
- Source of the work are being offered to the general public at no
- charge under subsection 6d.
-
- A separable portion of the object code, whose source code is excluded
-from the Corresponding Source as a System Library, need not be
-included in conveying the object code work.
-
- A "User Product" is either (1) a "consumer product", which means any
-tangible personal property which is normally used for personal, family,
-or household purposes, or (2) anything designed or sold for incorporation
-into a dwelling. In determining whether a product is a consumer product,
-doubtful cases shall be resolved in favor of coverage. For a particular
-product received by a particular user, "normally used" refers to a
-typical or common use of that class of product, regardless of the status
-of the particular user or of the way in which the particular user
-actually uses, or expects or is expected to use, the product. A product
-is a consumer product regardless of whether the product has substantial
-commercial, industrial or non-consumer uses, unless such uses represent
-the only significant mode of use of the product.
-
- "Installation Information" for a User Product means any methods,
-procedures, authorization keys, or other information required to install
-and execute modified versions of a covered work in that User Product from
-a modified version of its Corresponding Source. The information must
-suffice to ensure that the continued functioning of the modified object
-code is in no case prevented or interfered with solely because
-modification has been made.
-
- If you convey an object code work under this section in, or with, or
-specifically for use in, a User Product, and the conveying occurs as
-part of a transaction in which the right of possession and use of the
-User Product is transferred to the recipient in perpetuity or for a
-fixed term (regardless of how the transaction is characterized), the
-Corresponding Source conveyed under this section must be accompanied
-by the Installation Information. But this requirement does not apply
-if neither you nor any third party retains the ability to install
-modified object code on the User Product (for example, the work has
-been installed in ROM).
-
- The requirement to provide Installation Information does not include a
-requirement to continue to provide support service, warranty, or updates
-for a work that has been modified or installed by the recipient, or for
-the User Product in which it has been modified or installed. Access to a
-network may be denied when the modification itself materially and
-adversely affects the operation of the network or violates the rules and
-protocols for communication across the network.
-
- Corresponding Source conveyed, and Installation Information provided,
-in accord with this section must be in a format that is publicly
-documented (and with an implementation available to the public in
-source code form), and must require no special password or key for
-unpacking, reading or copying.
-
- 7. Additional Terms.
-
- "Additional permissions" are terms that supplement the terms of this
-License by making exceptions from one or more of its conditions.
-Additional permissions that are applicable to the entire Program shall
-be treated as though they were included in this License, to the extent
-that they are valid under applicable law. If additional permissions
-apply only to part of the Program, that part may be used separately
-under those permissions, but the entire Program remains governed by
-this License without regard to the additional permissions.
-
- When you convey a copy of a covered work, you may at your option
-remove any additional permissions from that copy, or from any part of
-it. (Additional permissions may be written to require their own
-removal in certain cases when you modify the work.) You may place
-additional permissions on material, added by you to a covered work,
-for which you have or can give appropriate copyright permission.
-
- Notwithstanding any other provision of this License, for material you
-add to a covered work, you may (if authorized by the copyright holders of
-that material) supplement the terms of this License with terms:
-
- a) Disclaiming warranty or limiting liability differently from the
- terms of sections 15 and 16 of this License; or
-
- b) Requiring preservation of specified reasonable legal notices or
- author attributions in that material or in the Appropriate Legal
- Notices displayed by works containing it; or
-
- c) Prohibiting misrepresentation of the origin of that material, or
- requiring that modified versions of such material be marked in
- reasonable ways as different from the original version; or
-
- d) Limiting the use for publicity purposes of names of licensors or
- authors of the material; or
-
- e) Declining to grant rights under trademark law for use of some
- trade names, trademarks, or service marks; or
-
- f) Requiring indemnification of licensors and authors of that
- material by anyone who conveys the material (or modified versions of
- it) with contractual assumptions of liability to the recipient, for
- any liability that these contractual assumptions directly impose on
- those licensors and authors.
-
- All other non-permissive additional terms are considered "further
-restrictions" within the meaning of section 10. If the Program as you
-received it, or any part of it, contains a notice stating that it is
-governed by this License along with a term that is a further
-restriction, you may remove that term. If a license document contains
-a further restriction but permits relicensing or conveying under this
-License, you may add to a covered work material governed by the terms
-of that license document, provided that the further restriction does
-not survive such relicensing or conveying.
-
- If you add terms to a covered work in accord with this section, you
-must place, in the relevant source files, a statement of the
-additional terms that apply to those files, or a notice indicating
-where to find the applicable terms.
-
- Additional terms, permissive or non-permissive, may be stated in the
-form of a separately written license, or stated as exceptions;
-the above requirements apply either way.
-
- 8. Termination.
-
- You may not propagate or modify a covered work except as expressly
-provided under this License. Any attempt otherwise to propagate or
-modify it is void, and will automatically terminate your rights under
-this License (including any patent licenses granted under the third
-paragraph of section 11).
-
- However, if you cease all violation of this License, then your
-license from a particular copyright holder is reinstated (a)
-provisionally, unless and until the copyright holder explicitly and
-finally terminates your license, and (b) permanently, if the copyright
-holder fails to notify you of the violation by some reasonable means
-prior to 60 days after the cessation.
-
- Moreover, your license from a particular copyright holder is
-reinstated permanently if the copyright holder notifies you of the
-violation by some reasonable means, this is the first time you have
-received notice of violation of this License (for any work) from that
-copyright holder, and you cure the violation prior to 30 days after
-your receipt of the notice.
-
- Termination of your rights under this section does not terminate the
-licenses of parties who have received copies or rights from you under
-this License. If your rights have been terminated and not permanently
-reinstated, you do not qualify to receive new licenses for the same
-material under section 10.
-
- 9. Acceptance Not Required for Having Copies.
-
- You are not required to accept this License in order to receive or
-run a copy of the Program. Ancillary propagation of a covered work
-occurring solely as a consequence of using peer-to-peer transmission
-to receive a copy likewise does not require acceptance. However,
-nothing other than this License grants you permission to propagate or
-modify any covered work. These actions infringe copyright if you do
-not accept this License. Therefore, by modifying or propagating a
-covered work, you indicate your acceptance of this License to do so.
-
- 10. Automatic Licensing of Downstream Recipients.
-
- Each time you convey a covered work, the recipient automatically
-receives a license from the original licensors, to run, modify and
-propagate that work, subject to this License. You are not responsible
-for enforcing compliance by third parties with this License.
-
- An "entity transaction" is a transaction transferring control of an
-organization, or substantially all assets of one, or subdividing an
-organization, or merging organizations. If propagation of a covered
-work results from an entity transaction, each party to that
-transaction who receives a copy of the work also receives whatever
-licenses to the work the party's predecessor in interest had or could
-give under the previous paragraph, plus a right to possession of the
-Corresponding Source of the work from the predecessor in interest, if
-the predecessor has it or can get it with reasonable efforts.
-
- You may not impose any further restrictions on the exercise of the
-rights granted or affirmed under this License. For example, you may
-not impose a license fee, royalty, or other charge for exercise of
-rights granted under this License, and you may not initiate litigation
-(including a cross-claim or counterclaim in a lawsuit) alleging that
-any patent claim is infringed by making, using, selling, offering for
-sale, or importing the Program or any portion of it.
-
- 11. Patents.
-
- A "contributor" is a copyright holder who authorizes use under this
-License of the Program or a work on which the Program is based. The
-work thus licensed is called the contributor's "contributor version".
-
- A contributor's "essential patent claims" are all patent claims
-owned or controlled by the contributor, whether already acquired or
-hereafter acquired, that would be infringed by some manner, permitted
-by this License, of making, using, or selling its contributor version,
-but do not include claims that would be infringed only as a
-consequence of further modification of the contributor version. For
-purposes of this definition, "control" includes the right to grant
-patent sublicenses in a manner consistent with the requirements of
-this License.
-
- Each contributor grants you a non-exclusive, worldwide, royalty-free
-patent license under the contributor's essential patent claims, to
-make, use, sell, offer for sale, import and otherwise run, modify and
-propagate the contents of its contributor version.
-
- In the following three paragraphs, a "patent license" is any express
-agreement or commitment, however denominated, not to enforce a patent
-(such as an express permission to practice a patent or covenant not to
-sue for patent infringement). To "grant" such a patent license to a
-party means to make such an agreement or commitment not to enforce a
-patent against the party.
-
- If you convey a covered work, knowingly relying on a patent license,
-and the Corresponding Source of the work is not available for anyone
-to copy, free of charge and under the terms of this License, through a
-publicly available network server or other readily accessible means,
-then you must either (1) cause the Corresponding Source to be so
-available, or (2) arrange to deprive yourself of the benefit of the
-patent license for this particular work, or (3) arrange, in a manner
-consistent with the requirements of this License, to extend the patent
-license to downstream recipients. "Knowingly relying" means you have
-actual knowledge that, but for the patent license, your conveying the
-covered work in a country, or your recipient's use of the covered work
-in a country, would infringe one or more identifiable patents in that
-country that you have reason to believe are valid.
-
- If, pursuant to or in connection with a single transaction or
-arrangement, you convey, or propagate by procuring conveyance of, a
-covered work, and grant a patent license to some of the parties
-receiving the covered work authorizing them to use, propagate, modify
-or convey a specific copy of the covered work, then the patent license
-you grant is automatically extended to all recipients of the covered
-work and works based on it.
-
- A patent license is "discriminatory" if it does not include within
-the scope of its coverage, prohibits the exercise of, or is
-conditioned on the non-exercise of one or more of the rights that are
-specifically granted under this License. You may not convey a covered
-work if you are a party to an arrangement with a third party that is
-in the business of distributing software, under which you make payment
-to the third party based on the extent of your activity of conveying
-the work, and under which the third party grants, to any of the
-parties who would receive the covered work from you, a discriminatory
-patent license (a) in connection with copies of the covered work
-conveyed by you (or copies made from those copies), or (b) primarily
-for and in connection with specific products or compilations that
-contain the covered work, unless you entered into that arrangement,
-or that patent license was granted, prior to 28 March 2007.
-
- Nothing in this License shall be construed as excluding or limiting
-any implied license or other defenses to infringement that may
-otherwise be available to you under applicable patent law.
-
- 12. No Surrender of Others' Freedom.
-
- If conditions are imposed on you (whether by court order, agreement or
-otherwise) that contradict the conditions of this License, they do not
-excuse you from the conditions of this License. If you cannot convey a
-covered work so as to satisfy simultaneously your obligations under this
-License and any other pertinent obligations, then as a consequence you may
-not convey it at all. For example, if you agree to terms that obligate you
-to collect a royalty for further conveying from those to whom you convey
-the Program, the only way you could satisfy both those terms and this
-License would be to refrain entirely from conveying the Program.
-
- 13. Use with the GNU Affero General Public License.
-
- Notwithstanding any other provision of this License, you have
-permission to link or combine any covered work with a work licensed
-under version 3 of the GNU Affero General Public License into a single
-combined work, and to convey the resulting work. The terms of this
-License will continue to apply to the part which is the covered work,
-but the special requirements of the GNU Affero General Public License,
-section 13, concerning interaction through a network will apply to the
-combination as such.
-
- 14. Revised Versions of this License.
-
- The Free Software Foundation may publish revised and/or new versions of
-the GNU General Public License from time to time. Such new versions will
-be similar in spirit to the present version, but may differ in detail to
-address new problems or concerns.
-
- Each version is given a distinguishing version number. If the
-Program specifies that a certain numbered version of the GNU General
-Public License "or any later version" applies to it, you have the
-option of following the terms and conditions either of that numbered
-version or of any later version published by the Free Software
-Foundation. If the Program does not specify a version number of the
-GNU General Public License, you may choose any version ever published
-by the Free Software Foundation.
-
- If the Program specifies that a proxy can decide which future
-versions of the GNU General Public License can be used, that proxy's
-public statement of acceptance of a version permanently authorizes you
-to choose that version for the Program.
-
- Later license versions may give you additional or different
-permissions. However, no additional obligations are imposed on any
-author or copyright holder as a result of your choosing to follow a
-later version.
-
- 15. Disclaimer of Warranty.
-
- THERE IS NO WARRANTY FOR THE PROGRAM, TO THE EXTENT PERMITTED BY
-APPLICABLE LAW. EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT
-HOLDERS AND/OR OTHER PARTIES PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY
-OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO,
-THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
-PURPOSE. THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE PROGRAM
-IS WITH YOU. SHOULD THE PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF
-ALL NECESSARY SERVICING, REPAIR OR CORRECTION.
-
- 16. Limitation of Liability.
-
- IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING
-WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MODIFIES AND/OR CONVEYS
-THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, INCLUDING ANY
-GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF THE
-USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED TO LOSS OF
-DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD
-PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER PROGRAMS),
-EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF
-SUCH DAMAGES.
-
- 17. Interpretation of Sections 15 and 16.
-
- If the disclaimer of warranty and limitation of liability provided
-above cannot be given local legal effect according to their terms,
-reviewing courts shall apply local law that most closely approximates
-an absolute waiver of all civil liability in connection with the
-Program, unless a warranty or assumption of liability accompanies a
-copy of the Program in return for a fee.
-
- END OF TERMS AND CONDITIONS
-
- How to Apply These Terms to Your New Programs
-
- If you develop a new program, and you want it to be of the greatest
-possible use to the public, the best way to achieve this is to make it
-free software which everyone can redistribute and change under these terms.
-
- To do so, attach the following notices to the program. It is safest
-to attach them to the start of each source file to most effectively
-state the exclusion of warranty; and each file should have at least
-the "copyright" line and a pointer to where the full notice is found.
-
-
- Copyright (C)
-
- This program is free software: you can redistribute it and/or modify
- it under the terms of the GNU General Public License as published by
- the Free Software Foundation, either version 3 of the License, or
- (at your option) any later version.
-
- This program is distributed in the hope that it will be useful,
- but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- GNU General Public License for more details.
-
- You should have received a copy of the GNU General Public License
- along with this program. If not, see .
-
-Also add information on how to contact you by electronic and paper mail.
-
- If the program does terminal interaction, make it output a short
-notice like this when it starts in an interactive mode:
-
- Copyright (C)
- This program comes with ABSOLUTELY NO WARRANTY; for details type `show w'.
- This is free software, and you are welcome to redistribute it
- under certain conditions; type `show c' for details.
-
-The hypothetical commands `show w' and `show c' should show the appropriate
-parts of the General Public License. Of course, your program's commands
-might be different; for a GUI interface, you would use an "about box".
-
- You should also get your employer (if you work as a programmer) or school,
-if any, to sign a "copyright disclaimer" for the program, if necessary.
-For more information on this, and how to apply and follow the GNU GPL, see
-.
-
- The GNU General Public License does not permit incorporating your program
-into proprietary programs. If your program is a subroutine library, you
-may consider it more useful to permit linking proprietary applications with
-the library. If this is what you want to do, use the GNU Lesser General
-Public License instead of this License. But first, please read
-.
diff --git a/henrovnix_ok/README.org b/henrovnix_ok/README.org
deleted file mode 100755
index 033539c97..000000000
--- a/henrovnix_ok/README.org
+++ /dev/null
@@ -1,2869 +0,0 @@
-f#+OPTIONS: toc:nil broken-links:t
-#+PROPERTY: header-args :noweb yes :results silent :mkdirp yes
-#+HTML:
-#+HTML:
-#+HTML:
-#+HTML:
![Emacs]()
-#+HTML:
-#+HTML:
-#+HTML:
Henrov's Literate System Configuration
-#+HTML:
-#+HTML:
- This repository contains system modules, user modules, and configuration fragments. The following directories are treated as separate layers:
- ./configuration (NixOS modules), ./home (Home Manager modules), and ./assets/conf (configuration fragments referenced or deployed by the modules).
-
-
- To keep navigation consistent, the same internal substructure is used in all three locations. Each layer keeps its role; only the internal grouping is standardized.
-
-
-** Shared domain folders
-
- core/ – base settings and common infrastructuredesktop/ – graphical session, compositor, UI components, and integrationapps/ – application enablement and application-level configurationservices/ – background services and daemonssecurity/ – secrets handling and security-related configurationdev/ – developer tooling and editor configuration
-
-** Full tree (including unchanged parts)
-
-The tree below shows the full repository layout, with the standardized internal structure applied only inside
-#+begin_src bash :tangle no
-├── assets
-│ ├── conf
-│ │ ├── app.
-├── assets
-│ ├── conf
-│ │ ├── apps
-│ │ ├── ollama.nix
-│ │ │ ├── flatpaks.conf
-│ │ │ └── packages.conf
-│ │ ├── core
-│ │ │ ├── lightdm.conf
-│ │ │ └── lightdm-gtk-greeter.conf
-│ │ ├── desktop
-│ │ │ ├── hypr
-│ │ │ │ ├── bindings.conf
-│ │ │ │ ├── hypridle.conf
-│ │ │ │ ├── hyprland.conf
-│ │ │ │ ├── hyprlock.conf
-│ │ │ │ ├── hyprshell
-│ │ │ │ │ ├── config.ron
-│ │ │ │ │ └── styles.css
-│ │ │ │ └── scripts
-│ │ │ │ ├── lid-lock.sh
-│ │ │ │ ├── lid-restore.sh
-│ │ │ │ └── powermenu.sh
-│ │ │ ├── wallpaper
-│ │ │ │ ├── gif
-│ │ │ │ ├── pictures
-│ │ │ │ │ ├── 1.jpg
-│ │ │ │ │ ├── 2.jpg
-│ │ │ │ │ ├── 3.jpg
-│ │ │ │ │ ├── 4.png
-│ │ │ │ │ ├── 5.jpg
-│ │ │ │ │ ├── 6.jpg
-│ │ │ │ │ ├── 7.jpg
-│ │ │ │ │ ├── 8.jpg
-│ │ │ │ │ └── 9.jpg
-│ │ │ │ ├── videos
-│ │ │ │ │ ├── dark_water_large.mp4
-│ │ │ │ │ └── white_blobs_small.mp4
-│ │ │ │ └── wallpaper.conf
-│ │ │ └── waybar
-│ │ │ ├── config.jsonc
-│ │ │ └── style.css
-│ │ ├── dev
-│ │ │ └── terminal
-│ │ │ ├── alacritty.toml
-│ │ │ ├── aliases.conf
-│ │ │ ├── Catppuccin-Mocha.conf
-│ │ │ ├── enabled_shells.conf
-│ │ │ ├── kitty.conf
-│ │ │ ├── starship.toml
-│ │ │ └── zsh.conf
-│ │ ├── security
-│ │ │ └── ssh
-│ │ │ └── ssh-client.conf
-│ │ └── services
-│ ├── lockscreen.png
-│ └── scripts
-├── configuration
-│ ├── apps
-│ │ ├── flatpaks.nix
-│ │ └── packages.nix
-│ ├── core
-│ │ ├── boot.nix
-│ │ ├── files.nix
-│ │ ├── locale.nix
-│ │ ├── login-lightdm.nix
-│ │ ├── login-tuigreeter.nix
-│ │ ├── networking.nix
-│ │ └── nix-settings.nix
-│ ├── default.nix
-│ ├── desktop
-│ │ ├── audio.nix
-│ │ └── hyprland.nix
-│ ├── dev
-│ │ └── terminal.nix
-│ └── services
-│ └── services.nix
-├── flake.lock
-├── flake.nix
-├── hardware
-│ └── hardware.nix
-├── home
-│ ├── apps
-│ │ ├── ollama.nix
-│ │ ├── defaults-apps.nix
-│ │ └── theme.nix
-│ ├── default.nix
-│ ├── desktop
-│ │ ├── animated_wallpaper.nix
-│ │ ├── hypridle.nix
-│ │ ├── hyprland.nix
-│ │ ├── hyprlock.nix
-│ │ ├── hyprshell.nix
-│ │ ├── powermenu.nix
-│ │ ├── rotating_wallpaper.nix
-│ │ ├── walker.nix
-│ │ └── waybar.nix
-│ └── dev
-│ ├── alacritty.nix
-│ ├── dev.nix
-│ ├── emacs
-│ │ ├── default.nix
-│ │ ├── early-init.el
-│ │ └── init.el
-│ ├── kitty.nix
-│ ├── shells.nix
-│ ├── starship.nix
-│ └── zsh.nix
-├── LICENSE
-├── machines
-│ └── traveldroid
-│ ├── configuration.nix
-│ ├── hardware-configuration.nix
-│ └── home.nix
-├── README.html
-├── README.org
-└── user.nix
-#+end_src
-
-** Notes
-
- - Only the internal layout of
configuration/, home/, and assets/conf/ is standardized; all other paths remain as currently organized.
- - The
services/ and security/ folders are included for completeness even if initially empty in some layers.
-
-
- ~YourNixCode(Input) -> System Configuration~
-
- I use [[https://nixos.wiki/wiki/Flakes][nix flakes]] which means that the entry point for the nix evaluation is a file called ~flake.nix~ which has two parts (among other things)
-
-#+begin_src nix
- {
- inputs: # describes the function input, consisting mainly of package sources
- outputs: # what the function outputs, a nixos configuration in our case
- }
- #+end_src
-
- Nix flakes is still behind an ~experimental~ flag, but it is de facto the standard by most of the community.
- Flakes allow us to pin the input package versions using a ~flake.lock~ file.
- This prevents unwanted and surprise updates when rebuilding without changing the configuration.
-
-* TLDR App List
-
-| Window Manager | [[https://hyprland.org/][Hyprland]] |
-| Bar | [[https://github.com/Alexays/Waybar][Waybar]] |
-| Application Launcher | [[https://github.com/abenz1267/walker][Walker]] |
-| Terminal Emulator | [[https://alacritty.org/][Alacritty]] |
-| Shell | [[https://ohmyz.sh/][Zsh]] and [[https://starship.rs/][Starship]] |
-| Text Editor | [[https://www.gnu.org/software/emacs/][Emacs]] |
-| File Manager | [[https://docs.xfce.org/xfce/thunar/start][Thunar]] |
-| Fonts | [[https://protesilaos.com/codelog/2025-02-12-aporetic-fonts-version-1-1-0/][Aporeti]] |
-| Colors | [[https://catppuccin.com/][Catppuccin]] |
-| Icons | [[https://nix.catppuccin.com/][Catppuccin Nix ]] |
-| Lock Screen | [[https://wiki.hyprland.org/Hypr-Ecosystem/hyprlock/][Hyprlock]] |
-| Wallpapers | [[https://github.com/hyprwm/hyprpaper][Hyprpaper]] |
-
-* Configuration Variables
-I have a bunch of constant strings that I would rather put in a file. Thats what ~user.nix~ is.
-The values are imported at the beginning and are available to almost all the functions being called to configure the system.
-#+begin_src nix :tangle user.nix
-{
- system = "x86_64-linux";
- username = "henrov";
- stateVersion = "25.11";
- locale = "nl_NL.UTF-8";
-}
-#+end_src
-
-* Flake Inputs
-The inputs for my system's configuration are very simple
-1. [[https://search.nixos.org/packages][nixpkgs]] - the main nix repository of packages. Its huge and growing. Pinned to the unstable release channel.
- Sometimes pinned to a specific commit because unstable broke something and the fix hasn't made it into the release yet.
-2. [[https://nix-community.github.io/home-manager/][home-manager]] - a nix module that helps keep track of user specific dotfiles and configurations as part of my nix config.
-3. [[https://github.com/nix-community/emacs-overlay][emacs-overlay]] - this has more configuration options and generally a newer emacs available provided by the community.
-4. [[https://nix.catppuccin.com/][catppuccin]] - nix module that allows everything to be catppuccin themed.
-
-#+begin_src nix :tangle flake.nix :noweb tangle
-{
- description = "Henrov's nixos configuration";
- inputs = {
- nixpkgs.url = "github:nixos/nixpkgs/nixos-unstable";
- home-manager = {
- url = "github:nix-community/home-manager";
- inputs.nixpkgs.follows = "nixpkgs";
- };
- emacs-overlay = {
- url = "github:nix-community/emacs-overlay";
- inputs.nixpkgs.follows = "nixpkgs";
- };
- catppuccin = {
- url = "github:catppuccin/nix";
- inputs.nixpkgs.follows = "nixpkgs";
- };
- zen-browser = {
- url = "github:youwen5/zen-browser-flake";
- inputs.nixpkgs.follows = "nixpkgs";
- };
- hyprland.url = "github:hyprwm/Hyprland";
- };
- <>
-}
-#+end_src
-
-* Flake Output
-Now that the inputs are ready, the outputs define what the system will actually look like. I also define the machines that this configuration specifies early on. Finally, I iterate over the ~machines~ list and pull files from ~/.machines/${name}~ subdirectory. This allows me to have configuration that has machine specific configuration limited to those files while also keeping a modular reusable base.
-We also add a devshell that makes editing this repository easier in emacs.
-
-#+name: flake-outputs
-#+begin_src nix :noweb no-export
- outputs = inputs@{
- nixpkgs,
- home-manager,
- emacs-overlay,
- catppuccin,
- hyprland,
- ...
- }:
- let
- user = import ./user.nix;
- lib = nixpkgs.lib;
- machines = [
- "traveldroid"
- ];
- pkgs = import nixpkgs {
- inherit (user) system;
- };
- in
- {
- nixosConfigurations = builtins.listToAttrs (
- builtins.map (machine: {
- name = machine;
- value = lib.nixosSystem {
- modules = [
- # Hyprland configuratie
- hyprland.nixosModules.default
- ({ config, pkgs, inputs, ... }: {
- programs.hyprland = {
- enable = true;
- package = hyprland.packages.${pkgs.system}.hyprland;
- };
- })
- <>
- <>
- <>
- catppuccin.nixosModules.catppuccin # theme
- ];
- specialArgs = {
- hostname = machine;
- inherit user;
- inherit inputs;
- flakeRoot.outPath= inputs.self;
- };
- };
- }) machines
- );
-
- devShells.${user.system}.default = pkgs.mkShell {
- buildInputs = with pkgs; [
- nil
- nixfmt-rfc-style
- ];
- };
- };
-
-#+end_src
-
-Lets look at the individual modules
-1. Emacs
- The first is the emacs overlay so that it uses the nix-community emacs overlay from the inputs instead of the nixpkgs one.
- Overlays are a special nix way to override existing packages within a repository.
-
- #+name: flake-emacs-module
- #+begin_src nix
- ({ lib, ... }: {
- nixpkgs.overlays = [ emacs-overlay.overlays.default ];
- })
- #+end_src
-
-2. Then the machine specific configuration, in this case, just "traveldroid".
- #+name: flake-config-module
- #+begin_src nix
- ./machines/${machine}/configuration.nix
- #+end_src
-
-3. And finally the home-manager module.
- This can be initialized and managed on its own but I'd rather use the ~nixos-rebuild~ command to build everything instead of managing userland dotfiles separately.
-
- #+name: flake-home-module
- #+begin_src nix :noweb no-export
- home-manager.nixosModules.home-manager
- {
- home-manager.useGlobalPkgs = true;
- home-manager.useUserPackages = true;
-
- home-manager.extraSpecialArgs = {
- inherit user inputs;
- flakeRoot.outPath= inputs.self;
- };
-
- <>
- <>
- }
-
- #+end_src
-
- - Home-Manager will not overwrite existing configuration files and that is good in most cases, but when everything is declarative like it is here, I'd rather that home-manager create a ~.backup~ and replace the file.
- #+name: flake-home-backup
- #+begin_src nix
- home-manager.backupFileExtension = "backup";
- #+end_src
-
- - Finally I pull in the machine specific home configuration. Along with the overrides from catppuccin.
- #+name: flake-home-config
- #+begin_src nix
- home-manager.users.${user.username} = {
- imports = [
- ./machines/${machine}/home.nix
- catppuccin.homeModules.catppuccin
- ];
- };
- #+end_src
-
-** Envrc + Direnv
-Editing this file will be much nicer if we have the dev environment configured.
-That is done in the devshells section. But to auto load this dev shell, we need a .envrc file.
-This tells [[https://direnv.net/][direnv]] to load the devshell in the flake.
-#Finally, we also look for a .envrc-private file and try to load that. That contains devshell specific secrets.
-
-#+begin_src nix :tangle .envrc
- use flake
-
- watch_file .envrc.private
- if [[ -f .envrc.private ]]; then
- source_env .envrc.private
- fi
-#+end_src
-
-* Machines
-The individual machines subdirectory is configured as follows :-
-#+name: tree
-#+begin_src ditaa
- +--machine
- | +--configuration.nix
- | +--home.nix
- | +--hardware-configuration.nix
-#+end_src
-
-- configuration.nix has the system configuration.
-- home.nix has the user level configuration.
-- hardware-configuration.nix has the unique hardware configuration.
-
-- Note about imports
- ~imports = []~ in a nix file will pull in the function/object from the list of files provided.
- This imported object (or function result) is just trivially merged into a common object.
-
-We can take a look at that the common hardware options I have for all my machines.
-*** Other Utils
-**** Updates
-To update the computer, I just need to update the ~flake.lock~ file to have references to the latest repository. This is done with :-
-#+begin_src bash
- nix flake update
-#+end_src
-
-* Hardware
-I'll let the code comments explain the file here.
-
-#+begin_src nix :tangle hardware/hardware.nix :noweb tangle :mkdirp yes
- { pkgs, lib, user, config, ...} :
- {
- nixpkgs.hostPlatform = lib.mkDefault user.system; # x86_64-linux
- powerManagement.cpuFreqGovernor = lib.mkDefault "powersave"; # enable power saving on the cpu
-
- # update cpu microcode with firmware that allows redistribution
- hardware.cpu.intel.updateMicrocode = lib.mkDefault config.hardware.enableRedistributableFirmware;
-
- hardware = {
- # always enable bluetooth
- bluetooth.enable = true;
-
- # always enable graphics drivers and enable a bunch of layers for it (including vulkan validation)
- graphics = {
- enable = true;
- extraPackages = with pkgs; [
- vulkan-validation-layers # helps catch and debug vulkan crashes
- ];
- };
- };
-
- hardware.enableAllFirmware = true; # enable all firmware regardless of license
- }
-#+end_src
-
-* Configuration
-This section describes the main system configuration for the computers that I have. Nix will look for a ~default.nix~ file if you give it a path to a folder to import. And ~default.nix~ looks as follows :-
-
-#+begin_src nix :tangle configuration/default.nix :noweb tangle :mkdirp yes
-{ pkgs, user, ... } :
-{
- imports = [
- ./apps/flatpaks.nix
- ./apps/packages.nix
- ./core/files.nix
- ./core/locale.nix
- ./core/networking.nix
- ./core/nix-settings.nix
- ./core/login-tuigreeter.nix
- #./core/login-lightdm.nix
- ./desktop/audio.nix
- ./desktop/hyprland.nix
- ./dev/terminal.nix
- ./core/boot.nix
- ./services/services.nix
- ./end_script.nix
- ];
-
- <>
-
- <>
-
- <>
-
- <>
-
- # enable the catppuccin theme for everything with mocha + blue accents
- catppuccin.enable = true;
- catppuccin.flavor = "mocha";
- catppuccin.accent = "blue";
-
- system.stateVersion = user.stateVersion;
-}
-#+end_src
-
-** Apps section
-This section describes a way of installing packages, either through nixpkgs or flatpak.
-What extra apps to install is decided in the files ./assets/conf/apps/packages.conf and flatpaks.conf.
-
-** packages.nix
-#+begin_src nix :tangle configuration/apps/packages.nix :noweb tangle :mkdirp yes
-{ config, lib, pkgs, flakeRoot, inputs, ... }:
-let
- packagesConfPath = flakeRoot.outPath + "/assets/conf/apps/packages.conf";
- raw = builtins.readFile packagesConfPath;
- # IMPORTANT: explicit "\n" so we never accidentally split into characters
- rawLines = lib.splitString "\n" raw;
- # Guard: if we accidentally split into characters, rawLines length ~= stringLength raw
- _guard = assert !(
- builtins.stringLength raw > 1 &&
- builtins.length rawLines == builtins.stringLength raw
- ); true;
- cleanLine = l:
- let
- noCR = lib.replaceStrings [ "\r" ] [ "" ] l;
- noInlineComment = lib.head (lib.splitString "#" noCR);
- in
- lib.strings.trim noInlineComment;
- entries =
- builtins.filter (l: l != "")
- (map cleanLine rawLines);
- resolvePkg = name:
- let
- parts = lib.splitString "." name;
- found = lib.attrByPath parts null pkgs;
- in
- if found == null then
- throw ''
- packages.nix: package not found in pkgs
- Token : ${builtins.toJSON name}
- packages.conf : ${toString packagesConfPath}
- Hint : check the attribute name on search.nixos.org/packages
- ''
- else
- found;
- packages = builtins.seq _guard (map resolvePkg entries);
- zenBrowser =
- inputs.zen-browser.packages.${pkgs.stdenv.hostPlatform.system}.default;
-in
-{
- environment.systemPackages =
- packages
- ++ [ zenBrowser ];
-}
-#+end_src
-
-** flatpaks.nix
-#+begin_src nix :tangle configuration/apps/flatpaks.nix :noweb tangle :mkdirp yes
-{ config, pkgs, lib, flakeRoot, ... }:
-let
- moduleName = "install-flatpaks";
- flatpakConfPath = flakeRoot.outPath + "/assets/conf/apps/flatpaks.conf";
- raw = builtins.readFile flatpakConfPath;
- # Explicit "\n" so we never accidentally split into characters
- rawLines = lib.splitString "\n" raw;
-
- # Guard: if we accidentally split into characters, rawLines length ~= stringLength raw
- _guard = assert !(
- builtins.stringLength raw > 1 &&
- builtins.length rawLines == builtins.stringLength raw
- ); true;
-
- cleanLine = l:
- let
- noCR = lib.replaceStrings [ "\r" ] [ "" ] l;
- noInlineComment = lib.head (lib.splitString "#" noCR);
- in
- lib.strings.trim noInlineComment;
-
- entries =
- builtins.filter (l: l != "")
- (map cleanLine rawLines);
-
- # Flatpak app IDs are reverse-DNS style like org.example.App (at least 2 dots).
- # We'll validate and fail early with a clear message.
- dotCount = s: builtins.length (lib.splitString "." s) - 1;
-
- isValidId = s:
- (dotCount s) >= 2; # matches the error you're seeing: "at least 2 periods"
-
- _validate =
- builtins.seq _guard (
- builtins.map (id:
- if isValidId id then true else
- throw ''
- ${moduleName}: invalid Flatpak ID in flatpaks.conf (needs reverse-DNS with at least 2 dots)
-
- Token : ${builtins.toJSON id}
- flatpaks.conf : ${toString flatpakConfPath}
-
- Fix: remove stray tokens/headers, or comment them out with '#'.
- ''
- ) entries
- );
-
- # Use validated entries
- flatpakApps = builtins.seq _validate entries;
-
- syncFlatpaks = pkgs.writeShellScript "sync-flatpaks" ''
- set -euo pipefail
-
- # Use the deployed config path (matches environment.etc below)
- CONF="/etc/flatpak/flatpaks.conf"
- if [[ -f "$CONF" ]]; then
- echo "flatpak-sync: using $CONF"
- else
- echo "flatpak-sync: WARNING: $CONF not found, using embedded list"
- fi
-
- if ! flatpak remotes --system --columns=name | grep -qx flathub; then
- flatpak remote-add --system --if-not-exists flathub https://dl.flathub.org/repo/flathub.flatpakrepo
- fi
-
- desired_apps=(
- ${lib.concatStringsSep "\n" (map (a: ''"${a}"'') flatpakApps)}
- )
-
- for app in "''${desired_apps[@]}"; do
- if ! flatpak info --system "$app" >/dev/null 2>&1; then
- flatpak install --system -y --noninteractive flathub "$app"
- fi
- done
- '';
-in
-{
- services.flatpak.enable = true;
-
- xdg.portal = {
- enable = true;
- };
-
- # Deploy the config file for runtime visibility/debugging
- environment.etc."flatpak/flatpaks.conf".source = lib.mkForce flatpakConfPath;
-
- systemd.services.flatpak-sync = {
- description = "Install Flatpak apps listed in flatpaks.conf";
- wantedBy = [ "multi-user.target" ];
- wants = [ "network-online.target" ];
- after = [ "network-online.target" ];
-
- serviceConfig = {
- Type = "oneshot";
- ExecStart = syncFlatpaks;
- };
-
- restartTriggers = [ flatpakConfPath ];
- path = [ pkgs.flatpak pkgs.coreutils pkgs.gnugrep pkgs.gnused ];
- };
-}
-#+end_src
-
-
-** Nix Settings
-These are global nix settings that configure the settings for the actual tool.
-
-#+begin_src nix :tangle configuration/core/nix-settings.nix :noweb tangle :mkdirp yes
-{ pkgs, user, ... } :
- {
- nix.settings = {
- # enable flakes
- experimental-features = ["nix-command" "flakes"];
-
- # add a cache that speed up new applications by downloading binaries
- # from the trusted cache instead of compiling from sourcer
- substituters = [
- "https://nix-community.cachix.org"
- ];
- # trust the cache public key
- trusted-public-keys = [
- "nix-community.cachix.org-1:mB9FSh9qf2dCimDSUo8Zy7bkq5CX+/rkCWyvRCYg3Fs="
- ];
- };
-
- # allow proprietary software on this machine. I'm not a purist.
- nixpkgs.config.allowUnfree = true;
-
- # this declares how often old configurations are cleared up.
- # i cleanup anything older than a week, every week.
- nix.gc = {
- automatic = true;
- options = "--delete-older-than 7d";
- dates = "weekly";
- };
-
- programs = {
- # command line utility that makes applying changes easy and pretty
- nh = {
- enable = true;
- flake = "/home/${user.username}/system";
- };
- };
- }
-#+end_src
-
-** Boot
-This file has most of the settings the control how the computer boots up.
-
-#+begin_src nix :tangle configuration/core/boot.nix :noweb tangle :mkdirp yes
-{ pkgs, ... } :
-{
- boot = {
- initrd = {
- verbose = false; # its a lot of logs. dont need it, unless we do.
- kernelModules = [ ]; # no kernel modules on boot
- };
-
- extraModulePackages = [ ]; # no extra packages on boot either
- kernelPackages = pkgs.linuxPackages_latest; # latest greatest linux kernel
- kernelParams = [ "silent" ]; # quiet those logs
-
- consoleLogLevel = 0; # quiten more logs
- plymouth.enable = true; # graphical boot animation instead
-
- supportedFilesystems = [ "ntfs" ]; # should see the ntfs (windows)
-
- loader = {
- systemd-boot.enable = true; # systemd-boot
- systemd-boot.configurationLimit = 10;
- efi.canTouchEfiVariables = true; # allow editing efi to edit the boot loader
-
-
- timeout = 5; # grub timeout to make a selection
- };
- };
-}
-#+end_src
-
-* Login
-Here we control what the login screen would look like. In configuration/default.nix you can choose whether to use tuigreet (very minimalistic) or LightDM (nicer, themeable)
-
-** Tuigreet
-Doesn't match the rest of the aesthetic of the system (with hyprland), but I like its simplicity.
-
-#+begin_src nix :tangle configuration/core/login-tuigreeter.nix :noweb tangle :mkdirp yes
- { pkgs, user, ... } :
- {
- environment.systemPackages = with pkgs; [
- tuigreet
- ];
- services.greetd = {
- enable = true;
- settings = {
- default_session = {
- command = pkgs.lib.mkForce "${pkgs.tuigreet}/bin/tuigreet --remember --time --time-format '%I:%M %p | %a • %h | %F'";
- };
- };
- };
- }
-#+end_src
-
-** LightDM
-#+begin_src nix :tangle configuration/core/login-lightdm.nix :noweb tangle :mkdirp yes
-{ config, pkgs, lib, ... }:
-
-let
- lightdmConf = builtins.readFile ../../assets/conf/core/lightdm.conf;
- lockPng = ../../assets/lockscreen.png;
-
- greeterConfPath = ../../assets/conf/core/lightdm-gtk-greeter.conf;
- greeterRaw = builtins.readFile greeterConfPath;
-
- # Extract "key = value" from the greeter conf.
- # Returns null if not found.
- getIniValue = key:
- let
- lines = lib.splitString "\n" greeterRaw;
-
- # Captures the value part (group 0) from a single line.
- # We match line-by-line because Nix regex does NOT support PCRE flags like (?s).
- m =
- let
- ms = builtins.filter (x: x != null) (map (line:
- builtins.match
- ("^[[:space:]]*" + key + "[[:space:]]*=[[:space:]]*([^#;]+).*$")
- line
- ) lines);
- in
- if ms == [] then null else builtins.elemAt ms 0;
- in
- if m == null then null else lib.strings.trim (builtins.elemAt m 0);
- # In your greeter.conf these are *package keys*, not theme names.
- themePkgKey = getIniValue "theme-name";
- iconPkgKey = getIniValue "icon-theme-name";
- cursorPkgKey = getIniValue "cursor-theme-name";
- cursorSizeStr = getIniValue "cursor-theme-size";
- cursorSize =
- if cursorSizeStr == null then null
- else lib.toInt (lib.strings.trim cursorSizeStr);
- # Map package-keys (from greeter.conf) -> { package, name }
- #
- # IMPORTANT:
- # - "name" must be the real theme/icon/cursor NAME as seen under share/themes or share/icons.
- # - "package" is the Nixpkgs derivation providing it.
- pkgMap = {
- catppuccinThemePkg = {
- package = pkgs.catppuccin-gtk.override {
- accents = [ "blue" ];
- variant = "mocha";
- size = "standard";
- tweaks = [ ];
- };
- name = "Catppuccin-Mocha-Standard-Blue-Dark";
- };
-
- papirus-icon-theme = {
- package = pkgs.papirus-icon-theme;
- name = "Papirus-Dark";
- };
-
- bibata-cursors = {
- package = pkgs.bibata-cursors;
- name = "Bibata-Modern-Ice";
- };
- };
-
- pick = key:
- if key == null then
- throw "lightdm: missing required key in ${toString greeterConfPath}"
- else if !(pkgMap ? "${key}") then
- throw "lightdm: unknown package key '${key}' in ${toString greeterConfPath}. Known keys: ${lib.concatStringsSep ", " (builtins.attrNames pkgMap)}"
- else
- pkgMap."${key}";
-
- themeSel = pick themePkgKey;
- iconSel = pick iconPkgKey;
- cursorSel = pick cursorPkgKey;
-
- # Rewrite greeter.conf so LightDM sees REAL names, not package keys.
- # Also force background to lockPng.
- greeterFixed =
- ''
- [greeter]
- theme-name = ${themeSel.name}
- icon-theme-name = ${iconSel.name}
- cursor-theme-name = ${cursorSel.name}
- ${lib.optionalString (cursorSize != null) "cursor-theme-size = ${toString cursorSize}"}
- ''
- + "\n"
- + greeterRaw;
-in
-{
- services.greetd.enable = false;
-
- services.xserver = {
- enable = true;
- desktopManager.xterm.enable = false;
-
- displayManager.lightdm = {
- enable = true;
- background = lockPng;
-
- greeters.gtk = {
- enable = true;
-
- theme = {
- name = themeSel.name;
- package = themeSel.package;
- };
-
- iconTheme = {
- name = iconSel.name;
- package = iconSel.package;
- };
-
- cursorTheme = {
- name = cursorSel.name;
- package = cursorSel.package;
- } // lib.optionalAttrs (cursorSize != null) {
- size = cursorSize;
- };
-
- # This includes your (rewritten) greeter config.
- extraConfig = greeterFixed;
- };
-
- extraConfig = lightdmConf;
- };
- };
-
- programs.hyprland.enable = true;
-
- # Optional: make them available system-wide as well
- environment.systemPackages = [
- themeSel.package
- iconSel.package
- cursorSel.package
- ];
-}
-
-#+end_src
-
-** Terminal (default system)
-This is the initial system level configuration for the terminal that I use on this machine. Its just [[https://ohmyz.sh/][zsh]].
-
-#+begin_src nix :tangle configuration/dev/terminal.nix :noweb tangle :mkdirp yes
-{ pkgs, user, ... }:
-{
- console.useXkbConfig = true;
- users.users.${user.username}.shell = pkgs.zsh;
- programs.zsh.enable = true;
- environment.shells = [ pkgs.zsh ];
- environment.pathsToLink = [ "/share/zsh" ];
-}
-#+end_src
-
-** Files
-I use Thunar as the file explorer. Also setup a few plugins for [[https://docs.xfce.org/xfce/thunar/start][Thunar]] in this config.
-Along with that, a few other utilities like zip and enabling services to automount usb drives.
-
-#+begin_src nix :tangle configuration/core/files.nix :noweb tangle :mkdirp yes
-{ pkgs, user, config, ... }:
-{
- environment.systemPackages = with pkgs; [
- zip
- unzip
- p7zip
- usbutils
- udiskie
- file-roller
- ];
-
- programs.thunar = {
- enable = true;
- plugins = with pkgs; [
- thunar-archive-plugin
- thunar-media-tags-plugin
- thunar-volman
- thunar-vcs-plugin
- ];
- };
-
- programs.xfconf.enable = true; # to save thunar settings
-
- services = {
- gvfs.enable = true; # Mount, trash, and other functionalities
- tumbler.enable = true; # Thumbnail support for images
- udisks2.enable = true; # Auto mount usb drives
- };
-}
-#+end_src
-
-** Locale
-I live in Netherlands and would like all my locale and timezone settings to match. Except my default locale.
-#+begin_src nix :tangle configuration/core/locale.nix :noweb tangle :mkdirp yes
- { user, ... } :
- let
- locale = user.locale;
- defaultLocale = "nl_NL.UTF-8";
- in
- {
- # Set your time zone.
- time.timeZone = "Europe/Amsterdam";
-
- # Select internationalisation properties.
- i18n.defaultLocale = defaultLocale;
-
- i18n.extraLocaleSettings = {
- LC_ADDRESS = locale;
- LC_IDENTIFICATION = locale;
- LC_MEASUREMENT = locale;
- LC_MONETARY = locale;
- LC_NAME = locale;
- LC_NUMERIC = locale;
- LC_PAPER = locale;
- LC_TELEPHONE = locale;
- LC_TIME = defaultLocale;
- };
- }
-#+end_src
-
-** Networking
-Not much to see here. I want networking to be enabled. I want firewall as well.
-#+begin_src nix :tangle configuration/core/networking.nix :noweb tangle :mkdirp yes
-{ pkgs, lib, ... }:
-{
- networking = {
- useDHCP = lib.mkDefault true;
- networkmanager.enable = true;
- networkmanager.wifi.backend = "iwd";
- wireless.iwd.enable = true;
- wireless.userControlled.enable = true;
- firewall = {
- enable = true;
- # KDE Connect: discovery + encrypted connections
- allowedTCPPortRanges = [
- { from = 1714; to = 1764; }
- ];
- allowedUDPPortRanges = [
- { from = 1714; to = 1764; }
- ];
- };
- };
- environment.systemPackages = with pkgs; [ impala ];
-}
-#+end_src
-
-** Hyprland
-This is a big one because the DE needs so much configuration. This section mostly installs [[https://hyprland.org/][Hyprland]].
-The configuration is done in the home manager section.
-#+begin_src nix :tangle configuration/desktop/hyprland.nix :noweb tangle :mkdirp yes
-{ pkgs, ... }:
-{
- nix.settings = {
- substituters = [ "https://hyprland.cachix.org" ];
- trusted-public-keys = [
- "hyprland.cachix.org-1:a7pgxzMz7+chwVL3/pzj6jIBMioiJM7ypFP8PwtkuGc="
- ];
- };
- services.dbus.enable = true;
- security.polkit.enable = true;
- services.flatpak.enable = true;
- services.pipewire = {
- enable = true;
- alsa.enable = true;
- alsa.support32Bit = true;
- pulse.enable = true;
- wireplumber.enable = true;
- };
- services.gvfs.enable = true;
- xdg.portal = {
- enable = true;
- config.common.default = [ "hyprland" "gtk" ];
- };
- environment.systemPackages = with pkgs; [
- walker
- uwsm
- hyprland-qtutils
- hyprpolkitagent
- grimblast
- ];
- programs = {
- uwsm.enable = true;
- uwsm.waylandCompositors.hyprland = {
- prettyName = "Hyprland";
- comment = "Hyprland compositor managed by UWSM";
- binPath = "/run/current-system/sw/bin/Hyprland";
- };
- hyprland = {
- withUWSM = true;
- enable = true;
- xwayland.enable = true;
- };
- };
- environment.sessionVariables = {
- XDG_SESSION_TYPE = "wayland";
- XDG_CURRENT_DESKTOP = "Hyprland";
- XDG_SESSION_DESKTOP = "Hyprland";
- NIXOS_OZONE_WL = "1";
- XCURSOR_SIZE = "24";
- };
- security.pam.services.hyprlock = { };
- # Optional; GNOME-specific (keep only if you really use gnome-keyring integration)
- security.pam.services.gdm.enableGnomeKeyring = true;
-}
-#+end_src
-
-** Setting the config
-#+begin_src nix :tangle configuration/end_script.nix :noweb tangle :mkdirp yes
-{ lib, ... }:
-{
- systemd.user.services.endScript = {
- description = "Run end script after Home Manager";
- after = [ "home-manager-activate.service" "graphical-session.target" ];
- serviceConfig = {
- Type = "oneshot";
- RemainAfterExit = true;
- ExecStart = "/path/to/your/script";
- };
- };
-}
-
-#+end_src
-
-** Services
-These are some of the services that I enable at the system level. Explanation in the comments.
-#+begin_src nix :tangle configuration/services/services.nix :noweb tangle :mkdirp yes
- { user, ...} :
- {
- services = {
- blueman.enable = true; # bluetooth manager
- fwupd.enable = true; # firmware updating service
- fstrim.enable = true; # ssd maintenance service
- thermald.enable = true; # thermal regulation service
- printing.enable = true; # printing services, cups
- gnome.gnome-keyring.enable = true; # keyring
- flatpak.enable = true; # allow installing things from flatpaks
- #flatpak remote-add --if-not-exists flathub https://flathub.org/repo/flathub.flatpakrepo
-
- # printer discovery
- avahi = {
- enable = true;
- nssmdns4 = true;
- openFirewall = true;
- };
- };
-
- virtualisation.docker.enable = true; # enable docker
- users.users.${user.username}.extraGroups = [ "docker" ]; # add self to docker user group
- }
-#+end_src
-
-** Audio
-#+begin_src nix :tangle configuration/desktop/audio.nix :noweb tangle :mkdirp yes
-{ config, pkgs, lib, ... }:
-
-{
- environment.systemPackages = with pkgs; [
- pipewire
- wireplumber
- alsa-utils
- pulseaudio
- pamixer
- pavucontrol
- ];
-
- services.pipewire = {
- enable = true;
- alsa.enable = true;
- alsa.support32Bit = true;
- pulse.enable = true;
- jack.enable = true;
- wireplumber.enable = true;
- };
-
- security.rtkit.enable = true;
-
- # Helps on many laptops (Intel SOF etc.)
- hardware.enableRedistributableFirmware = true;
-
- # Prefer analog over HDMI/DP in a machine-agnostic way
- services.pipewire.wireplumber.extraConfig."51-audio-priorities" = {
- "monitor.alsa.rules" = [
- # De-prioritize HDMI / DisplayPort sinks
- {
- matches = [
- { "node.name" = "~alsa_output\\..*HDMI.*"; }
- { "node.name" = "~alsa_output\\..*DisplayPort.*"; }
- ];
- actions.update-props = {
- "priority.session" = 100;
- "priority.driver" = 100;
- };
- }
-
- # Prefer analog sinks (speakers/headphones)
- {
- matches = [
- { "node.name" = "~alsa_output\\..*analog.*"; }
- { "node.name" = "~alsa_output\\..*Headphones.*"; }
- { "node.name" = "~alsa_output\\..*Speaker.*"; }
- ];
- actions.update-props = {
- "priority.session" = 2000;
- "priority.driver" = 2000;
- };
- }
- ];
- };
-
- # Optional: clear "sticky" user-selected defaults so priority rules win
- systemd.user.services.wireplumber-clear-default-nodes = {
- description = "Clear WirePlumber saved default nodes (avoid HDMI becoming sticky)";
-
- after = [ "wireplumber.service" ];
- partOf = [ "wireplumber.service" ];
- wantedBy = [ "default.target" ];
-
- serviceConfig = {
- Type = "oneshot";
- ExecStart = "${pkgs.coreutils}/bin/rm -f %h/.local/state/wireplumber/default-nodes";
- };
- };
-}
-#+end_src
-
-** Fonts
-Nothing much to see here. I love [[https://protesilaos.com/codelog/2025-02-12-aporetic-fonts-version-1-1-0/][Aporetic]], and I use it everywhere.
-#+name: config-fonts
-#+begin_src nix
- fonts.packages = with pkgs; [
- aporetic
- nerd-fonts.iosevka
- ];
-#+end_src
-
-** User Config
-This creates the user profile that I login with. Initially created during install.
-#+name: config-user
-#+begin_src nix
- users.users.${user.username} = {
- isNormalUser = true;
- description = "henrov";
- extraGroups = [
- "networkmanager" # allow editing network connections
- "wheel" # can do sudo
- "scanner" # access to the network scanner
- "lp" # access to the printer
- ];
- };
-#+end_src
-
-* Home
-I use home-manager to manage my user level dotfiles and configurations.
-Most of the "theme" of the system is decided here.
-I also use it to install programs that are okay with being installed at the user level instead of the system.
-
-** default.nix
-This module will import all necessities.
-
-#+begin_src nix :tangle home/default.nix :noweb tangle :mkdirp yes
-{ pkgs, user, ... } :
- {
- imports = [
- ./apps/ollama.nix
- ./apps/theme.nix
- ./desktop/hypridle.nix
- ./desktop/hyprland.nix
- ./desktop/hyprlock.nix
- ./desktop/hyprshell.nix
- #./desktop/animated_wallpaper.nix
- ./desktop/rotating_wallpaper.nix
- ./desktop/waybar.nix
- ./desktop/walker.nix
- ./dev/dev.nix
- ./dev/kitty.nix
- ./dev/shells.nix
- ./dev/starship.nix
- ./dev/zsh.nix
- ./dev/emacs
- ];
-
- <>
-
- <>
-
- programs.home-manager.enable = true;
- }
-#+end_src
-
-** Ollama
-This Home Manager Nix module (ai.nix) installs the Ollama package and configures it by reading a simple key-value configuration file (ollama.conf) for settings like the server host and default model. It sets environment variables (OLLAMA_HOST and OLAMA_DEFAULT_MODEL) for easy access in your shell or applications, with fallback defaults if the config file is missing or empty. Optionally, it also defines a user-level systemd service to automatically start the Ollama server on NixOS or systems with Home Manager’s systemd support enabled.
-
-#+begin_src nix :tangle home/apps/ollama.nix :noweb tangle :mkdirp yes
-{ config, lib, pkgs, flakeRoot, ... }:
-{
- services.ollama = {
- enable = true;
- package = pkgs.ollama;
- };
-}
-#+end_src
-
-** Animated Wallpaper
-Sets animated wallpaper ~/nixos_conf/wallpaperstuff/videos/myWallpaper.mp4
-#+begin_src nix :tangle home/desktop/animated_wallpaper.nix :noweb tangle :mkdirp yes
-{ config, pkgs, lib, flakeRoot, ... }:
-let
- userVideoPath = ".config/nixos_conf/wallpaperstuff/videos/myWallpaper.mp4";
-in
-{
- home.packages = [
- pkgs.mpvpaper
- pkgs.mpv
- ];
- systemd.user.services.mpvpaper-wallpaper = {
- Unit = {
- Description = "Video wallpaper (mpvpaper)";
- After = [ "graphical-session.target" ];
- PartOf = [ "graphical-session.target" ];
- };
- Service = {
- Type = "simple";
- ExecStart = ''
- ${pkgs.mpvpaper}/bin/mpvpaper \
- -p \
- -o "no-audio --loop-file=inf --no-terminal --really-quiet --panscan=1.0 --keepaspect=yes" \
- '*' "${userVideoPath}"
- '';
- Restart = "on-failure";
- RestartSec = 1;
- };
- Install = {
- WantedBy = [ "graphical-session.target" ];
- };
- };
-}
-#+end_src
-
-** Rotating Wallpaper
-rotating_wallpaper.nix installs wpaperd and deploys your wallpaper files from the repo (./assets/conf/desktop/wallpaper/pictures/) into ~/conf/desktop/wallpaper/pictures. It also deploys the default wallpaper configuration from assets/conf/desktop/wallpaper/wallpaper.conf into ~/conf/desktop/wallpaper/wallpaper.conf, which is the file you can edit as a user override.
-Finally, it creates a systemd user service (wpaperd.service) that automatically starts wpaperd at login and keeps it running, using your override config so wallpapers rotate according to your settings.
-#+begin_src nix :tangle home/desktop/rotating_wallpaper.nix :noweb tangle :mkdirp yes
-{ config, pkgs, lib, flakeRoot, ... }:
-let
- userConfPath = "${config.home.homeDirectory}/nixos_conf/wallpaperstuff/wallpaper.conf";
-in
-{
- home.packages = [ pkgs.wpaperd ];
- systemd.user.services.wpaperd = {
- Unit = {
- Description = "wpaperd wallpaper daemon";
- After = [ "default.target" ];
- };
- Service = {
- Type = "simple";
- ExecStart = "${pkgs.wpaperd}/bin/wpaperd --config ${userConfPath}";
- Restart = "on-failure";
- RestartSec = 1;
- };
- Install = {
- WantedBy = [ "default.target" ];
- };
- };
-}
-#+end_src
-
-** Waybar
-Mostly styling and enabling modules in the [[https://github.com/Alexays/Waybar][top bar]].
-#+begin_src nix :tangle home/desktop/waybar.nix :noweb tangle :mkdirp yes
-{ config, lib, pkgs, flakeRoot, ... }:
-{
- programs.waybar.enable = true;
-}
-#+end_src
-
-** Lock Screen
-The lock screen configured using [[https://wiki.hyprland.org/Hypr-Ecosystem/hyprlock/][hyprlock]].
-I use [[https://wiki.hyprland.org/Hypr-Ecosystem/hypridle/][hypridle]] to detect idle time and use wlogout to show a logout menu.
-They are configured below.
-#+begin_src nix :tangle home/desktop/hyprlock.nix :noweb tangle :mkdirp yes
-{ config, lib, pkgs, flakeRoot, ... }:
-{
- home.packages = [ pkgs.hyprlock ];
-}
-#+end_src
-
-** Idle Screen
-#+begin_src nix :tangle home/desktop/hypridle.nix :noweb tangle :mkdirp yes
-{ config, lib, pkgs, flakeRoot, ... }:
-{
- home.packages = [ pkgs.hypridle ];
-}
-#+end_src
-
-** Hyprshell
-For nice task-starting and -switching
-#+begin_src nix :tangle home/desktop/hyprshell.nix :noweb tangle :mkdirp yes
-# home/desktop/hyprshell.nix (Home-Manager module)
-{ config, pkgs, lib, flakeRoot, ... }:
-{
- xdg.enable = true;
- home.packages = [ pkgs.hyprshell ];
- # Autostart (systemd user service)
- systemd.user.services.hyprshell = {
- Unit = {
- Description = "Hyprshell (window switcher / launcher)";
- PartOf = [ "graphical-session.target" ];
- After = [ "graphical-session.target" ];
- };
- Service = {
- ExecStart = "${pkgs.hyprshell}/bin/hyprshell";
- Restart = "on-failure";
- RestartSec = 1;
- };
- Install = {
- WantedBy = [ "graphical-session.target" ];
- };
- };
-}
-#+end_src
-
-** Hyprland
-This configures the desktop environment along with the peripherals. The comments should explain whats happening.
-#+begin_src nix :tangle home/desktop/hyprland.nix :noweb tangle :mkdirp yes.
-{ config, lib, pkgs, flakeRoot, ... }:
-{
- wayland.windowManager.hyprland = {
- enable = true;
- settings = {
- };
- };
- xdg.portal = {
- enable = true;
- extraPortals = with pkgs; [
- xdg-desktop-portal-gtk
- xdg-desktop-portal-hyprland
- ];
- config.common.default = [ "gtk" ];
- config.hyprland = {
- "org.freedesktop.impl.portal.Screencast" = [ "hyprland" ];
- "org.freedesktop.impl.portal.RemoteDesktop" = [ "hyprland" ];
- };
- };
-}
-#+end_src
-
-** Walker
-[[https://github.com/abenz1267/walker][This]] is how I launch applications. It is bound to Win+Space in the ./asstes/conf/desktop/hypr/bindings.conf.
-#+begin_src nix :tangle home/desktop/walker.nix :noweb tangle :mkdirp yes.
-{ config, pkgs, lib, flakeRoot, inputs ? null, ... }:
-let
- walkerPkg =
- if inputs != null && inputs ? walker
- then inputs.walker.packages.${pkgs.system}.default
- else pkgs.walker;
- elephantPkg =
- if inputs != null && inputs ? elephant
- then inputs.elephant.packages.${pkgs.system}.default
- else pkgs.elephant;
- sessionTarget = "graphical-session.target";
-in
-{
- xdg.enable = true;
- home.packages = [ walkerPkg elephantPkg ];
- systemd.user.services.elephant = { };
- systemd.user.services.walker = { };
-}
-#+end_src
-
-** Theme
-I use the [[https://catppuccin.com/][Catppuccin]] almost everywhere. The nix module integrates almost automatically everywhere (except gtk).
-You'll notice the color values in multiple places outside this as well.
-#+begin_src nix :tangle home/apps/theme.nix :noweb tangle :mkdirp yes.
- { pkgs, ...}:
- {
- gtk = {
- enable = true;
- colorScheme = "dark";
- theme = {
- name = "Catppuccin-GTK-Grey-Dark-Compact";
- package = (pkgs.magnetic-catppuccin-gtk.override {
- accent = [ "grey" ];
- shade = "dark";
- tweaks = [ "black" ];
- size = "compact";
- });
- };
- iconTheme.name = "Papirus-Dark";
- };
- catppuccin.enable = true;
- catppuccin.flavor = "mocha";
- catppuccin.accent = "blue";
- catppuccin.gtk.icon.enable = true;
- catppuccin.cursors.enable = true;
- }
-#+end_src
-
-** Alacritty
-Alacritty gets installed and configured
-#+begin_src nix :tangle home/dev/alacritty.nix :noweb tangle :mkdirp yes.
-{ config, pkgs, lib, flakeRoot, ... }:
-{
- xdg.enable = true;
- programs.alacritty.enable = true;
- catppuccin.alacritty.flavor = "mocha";
-}
-#+end_src
-
-** Dev Tools
-All the miscellaneous dev tools on this computer.
-#+begin_src nix :tangle home/dev/dev.nix :noweb tangle :mkdirp yes
-{ config, pkgs, lib, ... }:
-{
- programs = {
- vscode.enable = true;
- vim.enable = true;
- ripgrep.enable = true;
- btop.enable = true;
- fzf = {
- enable = true;
- enableZshIntegration = true;
- enableBashIntegration = true;
- };
- zoxide = {
- enable = true;
- enableZshIntegration = true;
- enableBashIntegration = true;
- };
- eza = {
- enable = true;
- enableZshIntegration = true;
- enableBashIntegration = true;
- };
- direnv = {
- enable = true;
- enableZshIntegration = true;
- enableBashIntegration = true;
- nix-direnv.enable = true;
- };
- # Zsh-specific config belongs here
- zsh = {
- # for emacs-eat package
- initContent = lib.mkOrder 1200 ''
- [ -n "$EAT_SHELL_INTEGRATION_DIR" ] && \
- source "$EAT_SHELL_INTEGRATION_DIR/zsh"
- '';
- };
- git = {
- enable = true;
- lfs.enable = true;
- };
- };
-}
-#+end_src
-
-** Kitty
-Kitty gets installed and configured
-#+begin_src nix :tangle home/dev/kitty.nix :noweb tangle :mkdirp yes.
-{ config, pkgs, lib, flakeRoot, ... }:
-{
- xdg.enable = true;
- programs.kitty = {
- enable = true;
- extraConfig = ''
- # 1) Theme first (stable path)
- include themes/Catppuccin-Mocha.conf
- # 2) Force transparency last (wins)
- #background_opacity 0.60
- #dynamic_background_opacity yes
- '';
- };
-}
-#+end_src
-
-** Shells
-The aliases mentioned in ./assets/conf/dev/terminal/aliases.conf will be added to enabled shells
-#+begin_src nix :tangle home/dev/shells.nix :noweb tangle :mkdirp yes
-# shells.nix — Home-Manager module
-#
-# Reads:
-# ${flakeRoot}/assets/conf/shells.nixdev/terminal/enabled_shells.conf
-# ${flakeRoot}/assets/conf/dev/terminal/aliases.conf
-#
-# For each enabled shell in [enabled_shells]:
-# - installs/enables shell (where HM has an enable option)
-# - if ${flakeRoot}/assets/conf/dev/terminal/.conf exists, sources it
-# - ensures a *user-editable* aliases file exists in the shell’s default location
-# - if a shell is disabled, its aliases file is removed
-# .
-{ config, pkgs, lib, flakeRoot, ... }:
-let
- terminalDir = flakeRoot.outPath + "/assets/conf/dev/terminal";
- enabledFile = terminalDir + "/enabled_shells.conf";
- aliasesFile = terminalDir + "/aliases.conf";
- trim = lib.strings.trim;
- # ---------- minimal INI-ish parser (sections + raw lines) ----------
- readMaybe = p: if builtins.pathExists p then builtins.readFile p else "";
- normalizeLine = l: trim (lib.replaceStrings [ "\r" ] [ "" ] l);
- parseSections = text:
- let
- lines = map normalizeLine (lib.splitString "\n" text);
- isHeader = l:
- let s = l;
- in lib.hasPrefix "[" s
- && lib.hasSuffix "]" s
- && builtins.stringLength s >= 3;
- nameOf = l: lib.removeSuffix "]" (lib.removePrefix "[" l);
- folded =
- builtins.foldl'
- (st: l:
- if l == "" then st else
- if isHeader l then st // { current = nameOf l; }
- else
- let
- cur = st.current;
- prev = st.sections.${cur} or [];
- in
- st // { sections = st.sections // { ${cur} = prev ++ [ l ]; }; }
- )
- { current = "__root__"; sections = {}; }
- lines;
- in
- folded.sections;
- enabledSections = parseSections (readMaybe enabledFile);
- aliasSections = parseSections (readMaybe aliasesFile);
- # [enabled_shells] lines: key = yes/no
- enabledShells =
- let
- raw = enabledSections.enabled_shells or [];
- parseKV = l:
- let m = builtins.match ''^([A-Za-z0-9_-]+)[[:space:]]*=[[:space:]]*(.*)$'' l;
- in if m == null then null else {
- k = trim (builtins.elemAt m 0);
- v = lib.toLower (trim (builtins.elemAt m 1));
- };
- kvs = builtins.filter (x: x != null) (map parseKV raw);
- in
- map (x: x.k) (builtins.filter (x: x.v == "yes" || x.v == "true" || x.v == "1") kvs);
- shellEnabled = shell: builtins.elem shell enabledShells;
- # ---------- per-shell repo config file (.conf) ----------
- shellConfPath = shell: terminalDir + "/${shell}.conf";
- shellConfExists = shell: builtins.pathExists (shellConfPath shell);
- sourceIfExistsSh = p: ''
- if [ -f "${toString p}" ]; then
- source "${toString p}"
- fi
- '';
- # ---------- aliases section helpers ----------
- secLines = name: aliasSections.${name} or [];
- secText = name: lib.concatStringsSep "\n" (secLines name);
- # Default alias-file locations
- bashAliasesPath = "${config.home.homeDirectory}/.bash_aliases";
- zshAliasesPath = "${config.home.homeDirectory}/.zsh_aliases";
- fishAliasesPath = "${config.xdg.configHome}/fish/conf.d/aliases.fish";
- # Seeds (created once; user can edit afterwards)
- bashSeed = ''
- # Created once from: ${toString aliasesFile}
- # Edit freely; Home Manager will not overwrite this file.
- #
- ${secText "bash_zsh"}
- ${secText "bash_specific"}
- '';
- zshSeed = ''
- # Created once from: ${toString aliasesFile}
- # Edit freely; Home Manager will not overwrite this file.
- ${secText "bash_zsh"}
- ${secText "zsh_specific"}
- '';
- # Fish: translate [bash_zsh] POSIX alias lines + append [fish_specific] as-is
- parsePosixAlias = l:
- let
- m = builtins.match ''^[[:space:]]*alias[[:space:]]+([A-Za-z0-9_+-]+)=(.*)$'' l;
- in
- if m == null then null else
- let
- name = trim (builtins.elemAt m 0);
- rhs0 = trim (builtins.elemAt m 1);
- unquote =
- if lib.hasPrefix "'" rhs0 && lib.hasSuffix "'" rhs0 then
- lib.removeSuffix "'" (lib.removePrefix "'" rhs0)
- else if lib.hasPrefix "\"" rhs0 && lib.hasSuffix "\"" rhs0 then
- lib.removeSuffix "\"" (lib.removePrefix "\"" rhs0)
- else
- rhs0;
- in
- { inherit name; cmd = unquote; };
- escapeForFish = s:
- lib.replaceStrings
- [ "\\" "\"" "$" "`" ]
- [ "\\\\" "\\\"" "\\$" "\\`" ]
- s;
- fishTranslated =
- let
- parsed = builtins.filter (x: x != null) (map parsePosixAlias (secLines "bash_zsh"));
- in
- lib.concatStringsSep "\n" (map (a: ''alias ${a.name} "${escapeForFish a.cmd}"'') parsed);
- fishSeed = ''
- # Created once from: ${toString aliasesFile}
- # Edit freely; Home Manager will not overwrite this file.
- status is-interactive; or exit
- # Translated from [bash_zsh]:
- ${fishTranslated}
- # From [fish_specific]:
- ${secText "fish_specific"}
- '';
-in
-{
- xdg.enable = true;
- # Install/enable shells (no login-shell changes)
- programs.bash.enable = shellEnabled "bash";
- programs.zsh.enable = shellEnabled "zsh";
- programs.fish.enable = shellEnabled "fish";
- home.packages =
- (lib.optionals (shellEnabled "dash") [ pkgs.dash ]) ++
- (lib.optionals (shellEnabled "nushell") [ pkgs.nushell ]);
- # Source per-shell repo config (if present) AND source the user alias file (if it exists).
- # Important: define each option only ONCE.
- programs.bash.bashrcExtra = lib.mkIf (shellEnabled "bash") (lib.mkAfter ''
- ${lib.optionalString (shellConfExists "bash") (sourceIfExistsSh (shellConfPath "bash"))}
- if [ -f "${bashAliasesPath}" ]; then
- source "${bashAliasesPath}"
- fi
- '');
- programs.zsh.initContent = lib.mkIf (shellEnabled "zsh") (lib.mkAfter ''
- ${lib.optionalString (shellConfExists "zsh") (sourceIfExistsSh (shellConfPath "zsh"))}
- if [ -f "${zshAliasesPath}" ]; then
- source "${zshAliasesPath}"
- fi
- '');
- programs.fish.interactiveShellInit = lib.mkIf (shellEnabled "fish") (lib.mkAfter ''
- ${lib.optionalString (shellConfExists "fish") ''
- if test -f "${toString (shellConfPath "fish")}"
- source "${toString (shellConfPath "fish")}"
- end
- ''}
- if test -f "${fishAliasesPath}"
- source "${fishAliasesPath}"
- end
- '');
-# Create/remove alias files based on enabled shells
-home.activation.shellAliasesFiles = lib.hm.dag.entryAfter [ "writeBoundary" ] ''
- set -euo pipefail
- # bash -------------------------------------------------------
- if ${if shellEnabled "bash" then "true" else "false"}; then
- cat > "${bashAliasesPath}" <<'EOF'
-${bashSeed}
-EOF
- else
- rm -f "${bashAliasesPath}"
- fi
- # zsh -------------------------------------------------------
- if ${if shellEnabled "zsh" then "true" else "false"}; then
- cat > "${zshAliasesPath}" <<'EOF'
-${zshSeed}
-EOF
- else
- rm -f "${zshAliasesPath}"
- fi
- # fish -------------------------------------------------------
- if ${if shellEnabled "fish" then "true" else "false"}; then
- mkdir -p "$(dirname "${fishAliasesPath}")"
- cat > "${fishAliasesPath}" <<'EOF'
-${fishSeed}
-EOF
- else
- rm -f "${fishAliasesPath}"
- fi
- # fish
- if ${if shellEnabled "fish" then "true" else "false"}; then
- mkdir -p "$(dirname "${fishAliasesPath}")"
- if [ ! -f "${fishAliasesPath}" ]; then
- cat > "${fishAliasesPath}" <<'EOF'
-${fishSeed}
-EOF
- fi
- else
- rm -f "${fishAliasesPath}"
- fi
- '';
-}
-#+end_src
-
-** Zsh
-Zsh gets installed and configured
-#+begin_src nix :tangle home/dev/zsh.nix :noweb tangle :mkdirp yes.
-{ config, pkgs, lib, ... }:
-{
- programs.zsh = {
- enable = true;
- enableCompletion = true;
- autocd = true;
- dotDir = "${config.xdg.configHome}/zsh";
- oh-my-zsh = {
- enable = true;
- theme = "";
- plugins = [
- "git"
- "sudo"
- "extract"
- "colored-man-pages"
- "command-not-found"
- "history"
- "docker"
- "kubectl"
- ];
- };
- autosuggestion.enable = true;
- syntaxHighlighting.enable = true;
- };
-}
-#+end_src
-
-** Starship
-A nice way to make your prompt usefull
-#+begin_src nix :tangle home/dev/starship.nix :noweb tangle :mkdirp yes
-{ config, pkgs, lib, flakeRoot, ... }:
-{
- xdg.enable = true;
- programs.starship = {
- enable = true;
- enableZshIntegration = true;
- enableBashIntegration = true;
- enableFishIntegration = true;
- };
-}
-#+end_src
-
-** Other Settings
-Some repeated info from the configuration.
-*** Home User
-#+name: home-user
-#+begin_src nix
- home.username = "${user.username}";
- home.homeDirectory = pkgs.lib.mkDefault "/home/${user.username}";
- home.stateVersion = user.stateVersion;
-#+end_src
-
-* Emacs
-I practically live inside emacs. The configuration for it is a mix between init.el and the nix configuration.
-Nix allows me to install emacs packages as part of the configuration which is most of the following file.
-I install the nix community provided emacs overlay that lets me have the latest emacs with pgtk ui (for wayland).
-Comments describe the emacs package and what it does.
-#+begin_src nix :tangle home/dev/emacs/default.nix :noweb tangle :mkdirp yes
- { pkgs, ... }:
- {
- programs.emacs = {
- enable = true;
- # install with tree sitter enabled
- package = (pkgs.emacs-pgtk.override { withTreeSitter = true; });
- extraPackages = epkgs: [
- # also install all tree sitter grammars
- epkgs.manualPackages.treesit-grammars.with-all-grammars
- epkgs.nerd-icons # nerd fonts support
- epkgs.doom-modeline # model line
- epkgs.diminish # hides modes from modeline
- epkgs.eldoc # doc support
- epkgs.pulsar # pulses the cursor when jumping about
- epkgs.which-key # help porcelain
- epkgs.expreg # expand region
- epkgs.vundo # undo tree
- epkgs.puni # structured editing
- epkgs.avy # jumping utility
- epkgs.consult # emacs right click
- epkgs.vertico # minibuffer completion
- epkgs.marginalia # annotations for completions
- epkgs.crux # utilities
- epkgs.magit # git porcelain
- epkgs.nerd-icons-corfu # nerd icons for completion
- epkgs.corfu # completion
- epkgs.cape # completion extensions
- epkgs.orderless # search paradigm
- epkgs.yasnippet # snippets support
- epkgs.yasnippet-snippets # commonly used snippets
- epkgs.rg # ripgrep
- epkgs.exec-path-from-shell # load env and path
- epkgs.eat # better shell
- epkgs.rust-mode # rust mode (when rust-ts doesn't cut it)
- epkgs.rustic # more rust things
- epkgs.nix-mode # nix lang
- epkgs.hcl-mode # hashicorp file mode
- epkgs.shell-pop # quick shell popup
- epkgs.envrc # support for loading .envrc
- epkgs.nixpkgs-fmt # format nix files
- epkgs.f # string + file utilities
- epkgs.gptel # llm chat (mainly claude)
- epkgs.catppuccin-theme # catppuccin theme
- epkgs.eldoc-box # docs in a box
- epkgs.sideline # mainly for flymake errors on the side
- epkgs.sideline-flymake # mainly for flymake errors on the side
- epkgs.sideline-eglot # mainly for flymake errors on the side
- ];
- };
- home.sessionVariables = {
- EDITOR = "emacs";
- XDG_SCREENSHOTS_DIR = "~/screenshots";
- };
- home.file = {
- emacs-init = {
- source = ./early-init.el;
- target = ".emacs.d/early-init.el";
- };
- emacs = {
- source = ./init.el;
- target = ".emacs.d/init.el";
- };
- };
- services.nextcloud-client = {
- enable = true;
- };
- }
-#+end_src
-
-** Early EMACS Initialization
-There are some emacs settings that can be configured before the gui shows up.
-And some of them help increase performance and let the gui show up that much faster.
-These are listed here.
-
-#+begin_src emacs-lisp :tangle home/dev/emacs/early-init.el :mkdirp yes
- ;;; package --- early init -*- lexical-binding: t -*-
- ;;; Commentary:
- ;;; Prevents white flash and better Emacs defaults
- ;;; Code:
- (set-language-environment "UTF-8")
- (setq-default
- default-frame-alist
- '((background-color . "#1e1e2e")
- (bottom-divider-width . 1) ; Thin horizontal window divider
- (foreground-color . "#bac2de") ; Default foreground color
- (fullscreen . maximized) ; Maximize the window by default
- (horizontal-scroll-bars . nil) ; No horizontal scroll-bars
- (left-fringe . 8) ; Thin left fringe
- (menu-bar-lines . 0) ; No menu bar
- (right-divider-width . 1) ; Thin vertical window divider
- (right-fringe . 8) ; Thin right fringe
- (tool-bar-lines . 0) ; No tool bar
- (undecorated . t) ; Remove extraneous X decorations
- (vertical-scroll-bars . nil)) ; No vertical scroll-bars
- user-full-name "Henrov henrov" ; ME!
- ;; memory configuration
- ;; Higher garbage collection threshold, prevents frequent gc locks, reset later
- gc-cons-threshold most-positive-fixnum
- ;; Ignore warnings for (obsolete) elisp compilations
- byte-compile-warnings '(not obsolete)
- ;; And other log types completely
- warning-suppress-log-types '((comp) (bytecomp))
- ;; Large files are okay in the new millenium.
- large-file-warning-threshold 100000000
- ;; dont show garbage collection messages at startup, will reset later
- garbage-collection-messages nil
- ;; native compilation
- package-native-compile t
- native-comp-warning-on-missing-source nil
- native-comp-async-report-warnings-errors 'silent
- ;; Read more based on system pipe capacity
- read-process-output-max (max (* 10240 10240) read-process-output-max)
- ;; scroll configuration
- scroll-margin 0 ; Lets scroll to the end of the margin
- scroll-conservatively 100000 ; Never recenter the window
- scroll-preserve-screen-position 1 ; Scrolling back and forth
- ;; frame config
- ;; Improve emacs startup time by not resizing to adjust for custom settings
- frame-inhibit-implied-resize t
- ;; Dont resize based on character height / width but to exact pixels
- frame-resize-pixelwise t
- ;; backups & files
- backup-directory-alist '(("." . "~/.backups/")) ; Don't clutter
- backup-by-copying t ; Don't clobber symlinks
- create-lockfiles nil ; Don't have temp files
- delete-old-versions t ; Cleanup automatically
- kept-new-versions 6 ; Update every few times
- kept-old-versions 2 ; And cleanup even more
- version-control t ; Version them backups
- delete-by-moving-to-trash t ; Dont delete, send to trash instead
- ;; startup
- inhibit-startup-screen t ; I have already done the tutorial. Twice
- inhibit-startup-message t ; I know I am ready
- inhibit-startup-echo-area-message t ; Yep, still know it
- initial-scratch-message nil ; I know it is the scratch buffer!
- initial-buffer-choice nil
- inhibit-startup-buffer-menu t
- inhibit-x-resources t
- initial-major-mode 'fundamental-mode
- pgtk-wait-for-event-timeout 0.001 ; faster child frames
- ad-redefinition-action 'accept ; dont care about legacy things being redefined
- inhibit-compacting-font-caches t
- ;; tabs
- tab-width 4 ; Always tab 4 spaces.
- indent-tabs-mode nil ; Never use actual tabs.
- ;; rendering
- cursor-in-non-selected-windows nil ; dont render cursors other windows
- ;; packages
- use-package-always-defer t
- load-prefer-newer t
- default-input-method nil
- use-dialog-box nil
- use-file-dialog nil
- use-package-expand-minimally t
- package-enable-at-startup nil
- use-package-enable-imenu-support t
- auto-mode-case-fold nil ; No second pass of case-insensitive search over auto-mode-alist.
- package-archives '(("melpa" . "https://melpa.org/packages/")
- ("gnu" . "https://elpa.gnu.org/packages/")
- ("nongnu" . "https://elpa.nongnu.org/nongnu/")
- ("melpa-stable" . "https://stable.melpa.org/packages/"))
- package-archive-priorities '(("gnu" . 99)
- ("nongnu" . 80)
- ("melpa" . 70)
- ("melpa-stable" . 50))
- )
- ;;; early-init.el ends here
-#+end_src
-
-** EMACS Initialization
-Now starts the main emacs configuration.
-#+begin_src emacs-lisp :tangle home/dev/emacs/init.el :mkdirp yes
- ;;; package --- Summary - My minimal Emacs init file -*- lexical-binding: t -*-
-
- ;;; Commentary:
- ;;; Simple Emacs setup I carry everywhere
-
- ;;; Code:
- (setq custom-file (locate-user-emacs-file "custom.el"))
- (load custom-file 'noerror) ;; no error on missing custom file
-
- (require 'package)
- (package-initialize)
-
- (defun reset-custom-vars ()
- "Resets the custom variables that were set to crazy numbers"
- (setopt gc-cons-threshold (* 1024 1024 100))
- (setopt garbage-collection-messages t))
-
- (use-package emacs
- :custom
- (native-comp-async-query-on-exit t)
- (read-answer-short t)
- (use-short-answers t)
- (enable-recursive-minibuffers t)
- (which-func-update-delay 1.0)
- (visible-bell nil)
- (custom-buffer-done-kill t)
- (whitespace-line-column nil)
- (x-underline-at-descent-line t)
- (imenu-auto-rescan t)
- (uniquify-buffer-name-style 'forward)
- (confirm-nonexistent-file-or-buffer nil)
- (create-lockfiles nil)
- (make-backup-files nil)
- (kill-do-not-save-duplicates t)
- (sentence-end-double-space nil)
- (treesit-enabled-modes t)
- :init
- ;; base visual
- (menu-bar-mode -1) ;; no menu bar
- (toggle-scroll-bar -1) ;; no scroll bar
- (tool-bar-mode -1) ;; no tool bar either
- (blink-cursor-mode -1) ;; stop blinking
-
- ;; font of the century
- (set-frame-font "Aporetic Sans Mono 12" nil t)
-
- :bind
- (("C-" . pixel-scroll-precision) ; dont zoom in please, just scroll
- ("C-" . pixel-scroll-precision) ; dont zoom in either, just scroll
- ("C-x k" . kill-current-buffer)) ; kill the buffer, dont ask
- :hook
- (text-mode . delete-trailing-whitespace-mode)
- (prog-mode . delete-trailing-whitespace-mode)
- (after-init . global-display-line-numbers-mode) ;; always show line numbers
- (after-init . column-number-mode) ;; column number in the mode line
- (after-init . size-indication-mode) ;; file size in the mode line
- (after-init . pixel-scroll-precision-mode) ;; smooth mouse scroll
- (after-init . electric-pair-mode) ;; i mean ... parens should auto create
- (after-init . reset-custom-vars)
- )
-
- (use-package autorevert
- :ensure nil
- :custom
- (auto-revert-interval 3)
- (auto-revert-remote-files nil)
- (auto-revert-use-notify t)
- (auto-revert-avoid-polling nil)
- (auto-revert-verbose t)
- :hook
- (after-init . global-auto-revert-mode))
-
- (use-package recentf
- :ensure nil
- :commands (recentf-mode recentf-cleanup)
- :hook
- (after-init . recentf-mode)
- :custom
- (recentf-auto-cleanup 'never)
- (recentf-exclude
- (list "\\.tar$" "\\.tbz2$" "\\.tbz$" "\\.tgz$" "\\.bz2$"
- "\\.bz$" "\\.gz$" "\\.gzip$" "\\.xz$" "\\.zip$"
- "\\.7z$" "\\.rar$"
- "COMMIT_EDITMSG\\'"
- "\\.\\(?:gz\\|gif\\|svg\\|png\\|jpe?g\\|bmp\\|xpm\\)$"
- "-autoloads\\.el$" "autoload\\.el$"))
-
- :config
- ;; A cleanup depth of -90 ensures that `recentf-cleanup' runs before
- ;; `recentf-save-list', allowing stale entries to be removed before the list
- ;; is saved by `recentf-save-list', which is automatically added to
- ;; `kill-emacs-hook' by `recentf-mode'.
- (add-hook 'kill-emacs-hook #'recentf-cleanup -90))
-
- (use-package savehist
- :ensure nil
- :commands (savehist-mode savehist-save)
- :hook
- (after-init . savehist-mode)
- :custom
- (savehist-autosave-interval 600)
- (savehist-additional-variables
- '(kill-ring ; clipboard
- register-alist ; macros
- mark-ring global-mark-ring ; marks
- search-ring regexp-search-ring)))
-
- (use-package hl-line
- :ensure nil
- :custom
- (hl-line-sticky-flag nil)
- (global-hl-line-sticky-flag nil)
- :hook
- (after-init . global-hl-line-mode))
-
- (use-package saveplace
- :ensure nil
- :commands (save-place-mode save-place-local-mode)
- :hook
- (after-init . save-place-mode)
- :custom
- (save-place-limit 400))
-
- (use-package nerd-icons
- :custom
- ;; disable bright icon colors
- (nerd-icons-color-icons nil))hells.nix
-
- (use-package doom-modeline
- :custom
- (inhibit-compacting-font-caches t) ;; speed
- (doom-modeline-buffer-file-name-style 'relative-from-project)
- (doom-modeline-major-mode-icon nil) ;; distracting icons, no thank you
- (doom-modeline-buffer-encoding nil) ;; everything is utf-8 anyway
- (doom-modeline-buffer-state-icon nil) ;; the filename already shows me
- (doom-modeline-lsp nil) ;; lsp state is too distracting, too often
- :hook (after-init . doom-modeline-mode))
-
- (load-theme 'catppuccin :no-confirm)
-
- (use-package diminish :demand t) ;; declutter the modeline
- (use-package eldoc
- :diminish eldoc-mode
- :custom
- (eldoc-echo-area-use-multiline-p nil)) ;; docs for everything
-
- (use-package eldoc-box
- :defer t
- :config
- (set-face-background 'eldoc-box-border (catppuccin-color 'green))
- (set-face-background 'eldoc-box-body (catppuccin-color 'base))
- :bind
- (("M-h" . eldoc-box-help-at-point)))
-
- (use-package pulsar
- :commands pulsar-global-mode pulsar-recenter-top pulsar-reveal-entry
- :init
- (defface pulsar-catppuccin
- `((default :extend t)
- (((class color) (min-colors 88) (background light))
- :background ,(catppuccin-color 'sapphire))
- (((class color) (min-colors 88) (background dark))
- :background ,(catppuccin-color 'sapphire))
- (t :inverse-video t))
- "Alternative nord face for `pulsar-face'."
- :group 'pulsar-faces)
- :custom
- (pulsar-face 'pulsar-catppuccin)
- :hook
- (after-init . pulsar-global-mode))
-
- (use-package which-key
- :commands which-key-mode
- :diminish which-key-mode
- :hook
- (after-init . which-key-mode))
-
- (use-package expreg
- :bind ("M-m" . expreg-expand))
-
- (use-package vundo) ;; undo tree
-
- ;; better structured editing
- (use-package puni
- :commands puni-global-mode
- :hook
- (after-init . puni-global-mode))
-
- (use-package avy
- :bind
- ("M-i" . avy-goto-char-2)
- :custom
- (avy-background t))
-
- (use-package consult
- :bind
- ("C-x b" . consult-buffer) ;; orig. switch-to-buffer
- ("M-y" . consult-yank-pop) ;; orig. yank-pop
- ("M-g M-g" . consult-goto-line) ;; orig. goto-line
- ("M-g i" . consult-imenu) ;; consult version is interactive
- ("M-g r" . consult-ripgrep) ;; find in project also works
- :custom
- (consult-narrow-key "<"))
-
- (use-package vertico
- :commands vertico-mode
- :custom
- (read-file-name-completion-ignore-case t)
- (read-buffer-completion-ignore-case t)
- (completion-ignore-case t)
- (enable-recursive-minibuffers t)
- (minibuffer-prompt-properties '(read-only t cursor-intangible t face minibuffer-prompt))
- :init
- (vertico-mode)
- :hook
- (minibuffer-setup-hook . cursor-intangible-mode))
-
- (use-package marginalia
- :commands marginalia-mode
- :hook (after-init . marginalia-mode))
-
- (use-package crux
- :bind
- ("C-c M-e" . crux-find-user-init-file)
- ("C-c C-w" . crux-transpose-windows)
- ("C-c M-d" . crux-find-current-directory-dir-locals-file)
- ("C-a" . crux-move-beginning-of-line))
-
- (use-package magit
- :bind (("C-M-g" . magit-status)))
-
- (use-package nerd-icons-corfu
- :commands nerd-icons-corfu-formatter
- :defines corfu-margin-formatters)
-
- (use-package corfu
- :commands global-corfu-mode
- :custom
- (corfu-cycle t)
- (corfu-auto t)
- (corfu-auto-delay 1)
- (corfu-auto-prefix 3)
- (corfu-separator ?_)
- :hook
- (after-init . global-corfu-mode)
- :config
- (add-to-list 'corfu-margin-formatters #'nerd-icons-corfu-formatter))
-
- (use-package cape)
-
- (use-package orderless
- :custom
- (completion-styles '(orderless partial-completion basic))
- (completion-category-defaults nil)
- (completion-category-overrides nil))
-
- (use-package yasnippet
- :commands yas-global-mode
- :diminish yas-minor-mode
- :hook
- (after-init . yas-global-mode))
-
- (use-package yasnippet-snippets :after yasnippet)
-
- (use-package exec-path-from-shell
- :commands exec-path-from-shell-initialize
- :custom
- (exec-path-from-shell-arguments nil)
- :hook
- (after-init . exec-path-from-shell-initialize))
-
- (use-package nixpkgs-fmt
- :custom
- (nixpkgs-fmt-command "nixfmt"))
-
- (use-package eat
- :bind
- (("C-c e p" . eat-project)
- ("C-c e t" . eat)))
-
- (use-package f :demand t)
-
- (use-package envrc
- :commands envrc-global-mode
- :hook
- (after-init . envrc-global-mode))
-
- (use-package gptel
- :commands gptel-make-anthropic f-read-text
- :config
- (gptel-make-anthropic "Claude"
- :stream t :key (f-read-text "/run/secrets/claude_key")))
-
- (use-package sideline-flymake)
- (use-package sideline-eglot)
- (use-package sideline
- :custom
- (sideline-backends-right '(sideline-flymake sideline-eglot))
- :hook
- (eglot-managed-mode . sideline-mode)
- (flymake-mode . sideline-mode))
-
- (use-package eglot
- :custom
- (eglot-extend-to-xref t)
- (eglot-ignored-server-capabilities '(:inlayHintProvider))
- (jsonrpc-event-hook nil)
- :hook
- (eglot-managed-mode . eldoc-box-hover-mode)
- (before-save . eldoc-format-buffer)
- :bind
- (:map eglot-mode-map
- ("C-c l a" . eglot-code-actions)
- ("C-c l r" . eglot-rename)
- ("C-c l h" . eldoc)
- ("C-c l g" . xref-find-references)
- ("C-c l w" . eglot-reconnect)))
-
- (use-package proced
- :custom
- (proced-auto-update-flag t)
- (proced-auto-update-interval 3)
- (proced-enable-color-flag t)
- (proced-show-remote-processes t))
-
- (use-package org
- :ensure t
- :defer t
- :commands (org-mode org-capture org-agenda)
- :init
- (defvar org-journal-file "~/nextcloud/org/journal.org")
- (defvar org-archive-file "~/nextcloud/org/archive.org")
- (defvar org-notes-file "~/nextcloud/org/notes.org")
- (defvar org-inbox-file "~/nextcloud/org/inbox.org")
- (defvar org-work-file "~/nextcloud/org/work.org")
- (defun my/org-capture-project-target-heading ()
- "Determine Org target headings from the current file's project path.
-
- This function assumes a directory structure like '~/projects/COMPANY/PROJECT/'.
- It extracts 'COMPANY' and 'PROJECT' to use as nested headlines
- for an Org capture template.
-
- If the current buffer is not visi
- ting a file within such a
- project structure, it returns nil, causing capture to default to
- the top of the file."
- (when-let* ((path (buffer-file-name))) ; Ensure we are in a file-visiting buffer
- (let ((path-parts (split-string path "/" t " ")))
- (when-let* ((projects-pos (cl-position "projects" path-parts :test #'string=))
- (company (nth (+ 1 projects-pos) path-parts))
- (project (nth (+ 2 projects-pos) path-parts)))
- ;; Return a list of headlines for Org to find or create.
- (list company project)))))
- :bind
- (("C-c c" . org-capture)
- ("C-c i" . org-store-link)
- ("C-c a" . org-agenda)
- :map org-mode-map
- ("C-c t" . org-toggle-inline-images)
- ("C-c l" . org-toggle-link-display))
- :custom
- (org-agenda-files (list org-inbox-file org-journal-file))
- (org-directory "~/nextcloud/org")
- (org-default-notes-file org-inbox-file)
- (org-archive-location (concat org-archive-file "::* From %s"))
- (org-log-done 'time)
- (org-log-into-drawer t)
- (org-hide-emphasis-markers t)
- (org-src-fontify-natively t)
- (org-src-tab-acts-natively t)
- (org-capture-templates '(("t" "Todo" entry (file org-inbox-file)
- "* TODO %?\n:PROPERTIES:\n:CREATED: %U\n:END:\n\n%a\n\n)")
- ("j" "Journal" entry (file+olp+datetree org-journal-file)
- "* %?\n:PROPERTIES:\n:CREATED: %U\n:END:\n\n%a\n\n")
- ("n" "Note" entry (file org-notes-file)
- "* %?\n:PROPERTIES:\n:CREATED: %U\n:END:\n\n%a\n\n")
- ("p" "Project Task" item
- (file+function org-work-file my/org-capture-project-target-heading)
- "* TODO %? \n CLOCK: %U"
- ))
- )
- :config
- ;; Enable syntax highlighting in code blocks
- (add-hook 'org-mode-hook 'turn-on-font-lock)
- (add-hook 'org-mode-hook 'org-indent-mode))
-
- ;; extras
- (use-package comp-run
- :ensure nil
- :config
- (push "tramp-loaddefs.el.gz" native-comp-jit-compilation-deny-list)
- (push "cl-loaddefs.el.gz" native-comp-jit-compilation-deny-list))
-
- (use-package rustic
- :custom
- (rustic-lsp-client 'eglot))
-
- (provide 'init)
-
- ;;; init.el ends here
- #+end_src
-
-* Machines
-Only a few more things left. Specifically the machine level extra settings.
-** Traveldroid
-The configuration for the laptop does not change much. Most changes are because the hardware is different.
-*** System Level
-Anything specific for the laptop.
-#+begin_src nix :tangle machines/traveldroid/configuration.nix :noweb tangle :mkdirp yes
-{ user, ... } : {
- imports =
- [
- ./hardware-configuration.nix
- ../../configuration
- ];
-}
-#+end_src
-
-*** Hardware
-This is the most different. Mostly taken from hardware-configuration.nix setup at first install.
-
-#+begin_src nix :tangle machines/traveldroid/hardware-configuration.nix :noweb tangle :mkdirp yes
- {
- hostname,
- pkgs,
- lib,
- modulesPath,
- user,
- config,
- ...
- }:
- {
- imports = [
- (modulesPath + "/installer/scan/not-detected.nix")
- ../../hardware/hardware.nix
- ];
-
- boot.initrd.availableKernelModules = [ "xhci_pci" "nvme" "usb_storage" "sd_mod" "rtsx_usb_sdmmc" ];
- boot.initrd.kernelModules = [ ];
- boot.kernelModules = [ "kvm-intel" ];
- boot.extraModulePackages = [ ];
-
- fileSystems."/" =
- { device = "/dev/disk/by-uuid/69433a14-fbaf-401b-af85-cd1bbf02b4e2";
- fsType = "ext4";
- };
-
- fileSystems."/boot" =
- { device = "/dev/disk/by-uuid/811D-0676";
- fsType = "vfat";
- options = [ "fmask=0077" "dmask=0077" ];
- };
-
- swapDevices =
- [ { device = "/dev/disk/by-uuid/b6c557c2-7682-460b-a5e7-8f6f2f429a3a"; }
- ];
-
- nixpkgs.hostPlatform = lib.mkDefault "x86_64-linux";
- hardware.cpu.intel.updateMicrocode = lib.mkDefault config.hardware.enableRedistributableFirmware;
-
- }
-#+end_src
-
-*** Home
-This is mostly about configuring the monitor. And laptop specific utilities.
-#+begin_src nix :tangle machines/traveldroid/home.nix :noweb tangle :mkdirp yes
-{ pkgs, ... }:
-{
- imports = [
- ../../home
- ];
- home.packages = with pkgs; [
- brightnessctl
- ];
- wayland.windowManager.hyprland = {
- extraConfig = ''
- # Default portable monitor rule
- monitor=DP-1,3840x1080@144,1920x0,1
- '';
- };
-}
-#+end_src
-
-* README Utils
-*** Headers
-This script adds a =DO NOT MODIFY= header to all the generated nix files.
-#+NAME: startup
-#+BEGIN_SRC emacs-lisp
- (progn
- (defun add-tangle-headers ()
- (message "running in %s" (buffer-file-name))
- (when (string= (file-name-extension (buffer-file-name)) "nix")
- (goto-char (point-min))
- (insert "# WARNING : This file was generated by README.org\n# DO NOT MODIFY THIS FILE!\n# Any changes made here will be overwritten.\n")
- (save-buffer))
- (save-buffer))
- (add-hook 'org-babel-post-tangle-hook 'add-tangle-headers))
-#+END_SRC
-
-# Local Variables:
-# org-confirm-babel-evaluate: nil
-# eval: (progn (org-babel-goto-named-src-block "startup") (org-babel-execute-src-block) (outline-hide-sublevels 1))
-# End:
diff --git a/henrovnix_ok/assets/conf/apps/ai/ai.conf b/henrovnix_ok/assets/conf/apps/ai/ai.conf
deleted file mode 100644
index de9bd8ace..000000000
--- a/henrovnix_ok/assets/conf/apps/ai/ai.conf
+++ /dev/null
@@ -1,13 +0,0 @@
-{
- "language_models": {
- "ollama": {
- "api_url": "http://127.0.0.1:11434"
- }
- },
- "agent": {
- "default_model": {
- "provider": "ollama",
- "model": "codellama:70b"
- }
- }
-}
diff --git a/henrovnix_ok/assets/conf/apps/ai/ai.env b/henrovnix_ok/assets/conf/apps/ai/ai.env
deleted file mode 100644
index c9e4d3b05..000000000
--- a/henrovnix_ok/assets/conf/apps/ai/ai.env
+++ /dev/null
@@ -1,2 +0,0 @@
-MISTRAL_API_KEY=CWo91GHwIClzLj6bCLQ69IioSi54PpTZ
-OLLAMA_HOST=http://127.0.0.1:11434
diff --git a/henrovnix_ok/assets/conf/apps/ai/ollama/ollama.conf b/henrovnix_ok/assets/conf/apps/ai/ollama/ollama.conf
deleted file mode 100644
index e2b2c53e9..000000000
--- a/henrovnix_ok/assets/conf/apps/ai/ollama/ollama.conf
+++ /dev/null
@@ -1,5 +0,0 @@
-{
- "OLLAMA_HOST": "http://127.0.0.1:11434",
- "OLLAMA_DEFAULT_MODEL": "codellama:70b",
- "OLLAMA_ADDITIONAL_MODELS": "llama3.1:70b"
-}
diff --git a/henrovnix_ok/assets/conf/apps/flatpaks.conf b/henrovnix_ok/assets/conf/apps/flatpaks.conf
deleted file mode 100644
index 627a8daf5..000000000
--- a/henrovnix_ok/assets/conf/apps/flatpaks.conf
+++ /dev/null
@@ -1,22 +0,0 @@
-##############################################
-# These files are just for reference.
-# If you want to change anything, edit the source files in:
-# ~/henrovnix/assets/conf
-#
-# After that, run:
-# cd ~/henrovnix && emacs README.org --batch -f org-babel-tangle && git add . && git commit -m "Adjusted conf files" && sudo nixos-rebuild switch --flake .#
-#
-# If everything still works, you can use the same command but:
-# - keep "switch"
-# - and add a reboot:
-#
-# cd ~/henrovnix && sudo nixos-rebuild switch --flake .# && systemctl reboot
-#
-# NOTE:
-# Make sure the lines starting with: cd ~/henrovnix
-# are written as ONE single line.
-##############################################
-#app.zen_browser.zen
-com.github.tchx84.Flatseal
-eu.betterbird.Betterbird
-com.todoist.Todoist
diff --git a/henrovnix_ok/assets/conf/apps/packages.conf b/henrovnix_ok/assets/conf/apps/packages.conf
deleted file mode 100644
index 8dc2d8722..000000000
--- a/henrovnix_ok/assets/conf/apps/packages.conf
+++ /dev/null
@@ -1,79 +0,0 @@
-##############################################
-# These files are just for reference.
-# If you want to change anything, edit the source files in:
-# ~/henrovnix/assets/conf
-#
-# After that, run:
-# cd ~/henrovnix && emacs README.org --batch -f org-babel-tangle && git add . && git commit -m "Adjusted conf files" && sudo nixos-rebuild switch --flake .#
-#
-# If everything still works, you can use the same command but:
-# - keep "switch"
-# - and add a reboot:
-#
-# cd ~/henrovnix && sudo nixos-rebuild switch --flake .# && systemctl reboot
-#
-# Make sure the lines starting with: cd ~/henrovnix
-# are written as ONE single line.
-#
-#IMPORTANT:
-# Only packages/attributes that exist in Nixpkgs can be installed.
-# Check names on https://search.nixos.org/packages
-# A wrong package name (or attribute path) will cause the Nix build to fail.
-###############################################
-
-
-# system
-nixVersions.latest
-wofi
-xdg-utils
-desktop-file-utils
-playerctl
-mpv
-networkmanagerapplet
-
-#productivity
-todoist
-
-# browsers
-brave
-vivaldi
-chromium
-
-# hyprland
-hyprpaper
-
-# utils
-wget
-kdePackages.kdeconnect-kde
-_1password-gui
-tree
-gparted
-file
-htop
-wev
-solaar
-baobab
-duf
-zed-editor
-
-# office
-obsidian
-onlyoffice-desktopeditors
-
-# development
-postman
-tea
-
-#jetbrains.pycharm
-python3
-
-# communication
-nextcloud-talk-desktop
-signal-desktop
-openssl
-
-# multimedia
-audacity
-handbrake
-spotify
-vlc
diff --git a/henrovnix_ok/assets/conf/core/lightdm-gtk-greeter.conf b/henrovnix_ok/assets/conf/core/lightdm-gtk-greeter.conf
deleted file mode 100644
index 39e54aea0..000000000
--- a/henrovnix_ok/assets/conf/core/lightdm-gtk-greeter.conf
+++ /dev/null
@@ -1,7 +0,0 @@
-[greeter]
-theme-name = catppuccinThemePkg
-icon-theme-name = papirus-icon-theme
-cursor-theme-name = bibata-cursors
-cursor-theme-size = 24
-font-name = Sans 11
-indicators = ~host;~spacer;~clock;~spacer;~session;~language;~power
diff --git a/henrovnix_ok/assets/conf/core/lightdm.conf b/henrovnix_ok/assets/conf/core/lightdm.conf
deleted file mode 100644
index 159ccc4cc..000000000
--- a/henrovnix_ok/assets/conf/core/lightdm.conf
+++ /dev/null
@@ -1,27 +0,0 @@
-##############################################
-# These files are just for reference.
-# If you want to change anything, edit the source files in:
-# ~/henrovnix/assets/conf
-#
-# After that, run:
-# cd ~/henrovnix && emacs README.org --batch -f org-babel-tangle && git add . && git commit -m "Adjusted conf files" && sudo nixos-rebuild switch --flake .#
-#
-# If everything still works, you can use the same command but:
-# - keep "switch"
-# - and add a reboot:
-#
-# cd ~/henrovnix && sudo nixos-rebuild switch --flake .# && systemctl reboot
-#
-# NOTE:
-# Make sure the lines starting with: cd ~/henrovnix
-# are written as ONE single line.
-##############################################
-# Minimal Hyprland config for greetd
-
-[LightDM]
-run-directory=/run/lightdm
-
-[Seat:*]
-greeter-session=lightdm-gtk-greeter
-user-session=hyprland
-allow-guest=false
diff --git a/henrovnix_ok/assets/conf/dev/terminal/Catppuccin-Mocha.conf b/henrovnix_ok/assets/conf/dev/terminal/Catppuccin-Mocha.conf
deleted file mode 100644
index 6eb38becc..000000000
--- a/henrovnix_ok/assets/conf/dev/terminal/Catppuccin-Mocha.conf
+++ /dev/null
@@ -1,84 +0,0 @@
-# vim:ft=kitty
-
-## name: Catppuccin Kitty Mocha
-## author: Catppuccin Org
-## license: MIT
-## upstream: https://github.com/catppuccin/kitty/blob/main/themes/mocha.conf
-## blurb: Soothing pastel theme for the high-spirited!
-
-
-
-# The basic colors
-foreground #cdd6f4
-background #1e1e2e
-selection_foreground #1e1e2e
-selection_background #f5e0dc
-
-# Cursor colors
-cursor #f5e0dc
-cursor_text_color #1e1e2e
-
-# Scrollbar colors
-scrollbar_handle_color #9399b2
-scrollbar_track_color #45475a
-
-# URL color when hovering with mouse
-url_color #f5e0dc
-
-# Kitty window border colors
-active_border_color #b4befe
-inactive_border_color #6c7086
-bell_border_color #f9e2af
-
-# OS Window titlebar colors
-wayland_titlebar_color system
-macos_titlebar_color system
-
-# Tab bar colors
-active_tab_foreground #11111b
-active_tab_background #cba6f7
-inactive_tab_foreground #cdd6f4
-inactive_tab_background #181825
-tab_bar_background #11111b
-
-# Colors for marks (marked text in the terminal)
-mark1_foreground #1e1e2e
-mark1_background #b4befe
-mark2_foreground #1e1e2e
-mark2_background #cba6f7
-mark3_foreground #1e1e2e
-mark3_background #74c7ec
-
-# The 16 terminal colors
-
-# black
-color0 #45475a
-color8 #585b70
-
-# red
-color1 #f38ba8
-color9 #f38ba8
-
-# green
-color2 #a6e3a1
-color10 #a6e3a1
-
-# yellow
-color3 #f9e2af
-color11 #f9e2af
-
-# blue
-color4 #89b4fa
-color12 #89b4fa
-
-# magenta
-color5 #f5c2e7
-color13 #f5c2e7
-
-# cyan
-color6 #94e2d5
-color14 #94e2d5
-
-# white
-color7 #bac2de
-color15 #a6adc8
diff --git a/henrovnix_ok/assets/conf/dev/terminal/aliases.conf b/henrovnix_ok/assets/conf/dev/terminal/aliases.conf
deleted file mode 100644
index 4f74b33a7..000000000
--- a/henrovnix_ok/assets/conf/dev/terminal/aliases.conf
+++ /dev/null
@@ -1,72 +0,0 @@
-##############################################
-# Aliases (source-of-truth)
-#
-# This file is written in bash/zsh alias syntax in [bash_zsh], [bash_specific], [zsh_specific].
-# Fish has different syntax; the Nix module translates [bash_zsh] into fish format and then
-# appends [fish_specific] as-is.
-##############################################
-
-##############################################
-# Generic aliases (bash/zsh)
-# These are intended to be available in bash and zsh.
-##############################################
-[bash_zsh]
-alias ll='ls -lah'
-alias gs='git status'
-alias ga='git add'
-alias gc='git commit'
-alias gp='git push'
-alias gcp='git add . && git commit && git push'
-
-alias cd='z'
-
-alias nps='xdg-open https://search.nixos.org'
-alias hvnx='cd ~/Repos/nixos/henrovnix_ok'
-alias emt='hvnx && emacs README.org --batch -f org-babel-tangle && emacs -Q --batch README.org -f org-html-export-to-html'
-alias nxs='hvnx && sudo nixos-rebuild switch --flake .#traveldroid'
-alias nxt='hvnx && sudo nixos-rebuild test --flake .#traveldroid'
-alias nxv='hvnx && sudo nixos-rebuild build-vm --flake .#traveldroid && "$(ls -1 ./result/bin/run-*-vm | head -n 1)"'
-
-alias rb='systemctl reboot'
-alias po='systemctl poweroff'
-
-alias fpl='flatpak list'
-alias fps='flatpak search'
-alias fpi='flatpak install'
-alias fpr='flatpak run'
-
-alias nxc='ssh henrov@nextcloud.data-pro.nu'
-
-
-alias vs='code'
-alias blog='cd ~/Repos/blog && ll'
-alias keys='hyprctl binds'
-
-
-##############################################
-# Shell-specific aliases / examples
-#
-# Everything below is COMMENTED OUT on purpose.
-# These examples show syntax or commands that are shell-specific
-# (or behave differently across shells).
-##############################################
-
-[bash_specific]
-# Enable recursive globbing (**)
-# alias sg='shopt -s globstar'
-
-[zsh_specific]
-# Recursive globbing works by default in zsh; this prints matches one-per-line
-# alias recglob='print -l **/*.nix'
-
-[fish_specific]
-# Fish has its own language; this is fish-only syntax (not bash/zsh)
-# alias setvar='set -gx EDITOR emacs'
-
-[dash_specific]
-# dash is a minimal POSIX shell; shown here only as an example
-# alias com='command -v ls'
-
-[nushell_specific]
-# Nushell pipelines structured data; this is nu-only syntax
-# alias fbf='ls | where size > 1mb | get name'
diff --git a/henrovnix_ok/assets/conf/dev/terminal/enabled_shells.conf b/henrovnix_ok/assets/conf/dev/terminal/enabled_shells.conf
deleted file mode 100644
index f2ae8d5c2..000000000
--- a/henrovnix_ok/assets/conf/dev/terminal/enabled_shells.conf
+++ /dev/null
@@ -1,15 +0,0 @@
-##############################################
-# Enabled shells (source-of-truth)
-#
-# Edit this file in the repo:
-# ./assets/conf/dev/terminal/enabled_shells.conf
-#
-# After changing, rebuild Home Manager / your system as you normally do.
-##############################################
-
-[enabled_shells]
-bash = yes
-zsh = yes
-fish = no
-dash = no
-nushell = no
diff --git a/henrovnix_ok/assets/copy_stuff/.config/Thunar/accels.scm b/henrovnix_ok/assets/copy_stuff/.config/Thunar/accels.scm
deleted file mode 100644
index d4035cb56..000000000
--- a/henrovnix_ok/assets/copy_stuff/.config/Thunar/accels.scm
+++ /dev/null
@@ -1,131 +0,0 @@
-; thunar GtkAccelMap rc-file -*- scheme -*-
-; this file is an automated accelerator map dump
-;
-; (gtk_accel_path "/ThunarDetailsView/expandable-folders" "")
-; (gtk_accel_path "/ThunarBookmarks/f4f9b7c05a683015a19351e94cf07e3d" "")
-; (gtk_accel_path "/ThunarStandardView/sort-by-type" "")
-; (gtk_accel_path "/ThunarStatusBar/toggle-last-modified" "")
-; (gtk_accel_path "/Thunarwindow/menu" "")
-; (gtk_accel_path "/ThunarActionManager/cut" "x")
-; (gtk_accel_path "/ThunarStandardView/sort-by-size" "")
-; (gtk_accel_path "/ThunarWindow/file-menu" "")
-; (gtk_accel_path "/ThunarWindow/close-tab" "w")
-; (gtk_accel_path "/ThunarWindow/switch-previous-tab-alt" "ISO_Left_Tab")
-; (gtk_accel_path "/ThunarStatusBar/toggle-size" "")
-; (gtk_accel_path "/ThunarWindow/new-window" "n")
-; (gtk_accel_path "/ThunarWindow/clear-directory-specific-settings" "")
-; (gtk_accel_path "/ThunarWindow/close-window" "q")
-; (gtk_accel_path "/ThunarWindow/open-parent" "Up")
-; (gtk_accel_path "/ThunarWindow/view-side-pane-menu" "")
-; (gtk_accel_path "/ThunarStatusBar/toggle-size-in-bytes" "")
-; (gtk_accel_path "/ThunarWindow/switch-previous-tab" "Page_Up")
-; (gtk_accel_path "/ThunarActionManager/open" "o")
-; (gtk_accel_path "/ThunarStandardView/sort-ascending" "")
-; (gtk_accel_path "/ThunarWindow/toggle-split-view" "F3")
-; (gtk_accel_path "/ThunarActionManager/copy-2" "Insert")
-; (gtk_accel_path "/ThunarActionManager/trash-delete" "Delete")
-; (gtk_accel_path "/ThunarWindow/open-recent" "")
-; (gtk_accel_path "/ThunarWindow/view-configure-toolbar" "")
-; (gtk_accel_path "/ThunarStandardView/forward" "Right")
-; (gtk_accel_path "/ThunarActionManager/restore" "")
-; (gtk_accel_path "/ThunarWindow/open-location-alt" "d")
-; (gtk_accel_path "/ThunarWindow/zoom-out-alt" "KP_Subtract")
-; (gtk_accel_path "/ThunarStandardView/select-by-pattern" "s")
-; (gtk_accel_path "/ThunarWindow/open-file-menu" "F10")
-; (gtk_accel_path "/ThunarWindow/contents" "F1")
-; (gtk_accel_path "/ThunarWindow/show-highlight" "")
-; (gtk_accel_path "/ThunarStandardView/sort-descending" "")
-; (gtk_accel_path "/ThunarStandardView/sort-by-name" "")
-; (gtk_accel_path "/ThunarBookmarks/b642744ba505349eb43f3232902f4a96" "")
-; (gtk_accel_path "/ThunarStandardView/select-all-files" "a")
-; (gtk_accel_path "/ThunarActionManager/execute" "")
-; (gtk_accel_path "/ThunarStandardView/properties" "Return")
-; (gtk_accel_path "/ThunarActionManager/cut-2" "")
-; (gtk_accel_path "/ThunarStandardView/sort-by-dtime" "")
-; (gtk_accel_path "/ThunarBookmarks/51e116aa815495db13c58c73eec99304" "")
-; (gtk_accel_path "/ThunarWindow/switch-next-tab" "Page_Down")
-; (gtk_accel_path "/ThunarWindow/open-templates" "")
-; (gtk_accel_path "/ThunarActionManager/paste-2" "Insert")
-; (gtk_accel_path "/ThunarStatusBar/toggle-filetype" "")
-; (gtk_accel_path "/ThunarWindow/close-all-windows" "w")
-; (gtk_accel_path "/ThunarStandardView/create-document" "")
-; (gtk_accel_path "/ThunarWindow/detach-tab" "")
-; (gtk_accel_path "/ThunarWindow/cancel-search" "Escape")
-; (gtk_accel_path "/ThunarWindow/zoom-in-alt2" "equal")
-; (gtk_accel_path "/ThunarStatusBar/toggle-hidden-count" "")
-; (gtk_accel_path "/ThunarShortcutsPane/sendto-shortcuts" "d")
-; (gtk_accel_path "/ThunarActionManager/undo" "z")
-; (gtk_accel_path "/ThunarBookmarks/f08c8da7eedf52bf1705513340708bed" "")
-; (gtk_accel_path "/ThunarStandardView/toggle-sort-order" "")
-; (gtk_accel_path "/ThunarWindow/view-location-selector-entry" "")
-; (gtk_accel_path "/ThunarActionManager/paste" "v")
-; (gtk_accel_path "/ThunarWindow/zoom-in-alt1" "KP_Add")
-; (gtk_accel_path "/ThunarWindow/view-menubar" "m")
-; (gtk_accel_path "/ThunarStandardView/back" "Left")
-; (gtk_accel_path "/ThunarWindow/open-desktop" "")
-; (gtk_accel_path "/ThunarWindow/view-as-detailed-list" "2")
-; (gtk_accel_path "/ThunarActionManager/restore-show" "")
-; (gtk_accel_path "/ThunarWindow/sendto-menu" "")
-; (gtk_accel_path "/ThunarStatusBar/toggle-display-name" "")
-; (gtk_accel_path "/ThunarWindow/go-menu" "")
-; (gtk_accel_path "/ThunarWindow/zoom-out" "minus")
-; (gtk_accel_path "/ThunarWindow/remove-from-recent" "")
-; (gtk_accel_path "/ThunarActionManager/open-with-other" "")
-; (gtk_accel_path "/ThunarStandardView/invert-selection" "i")
-; (gtk_accel_path "/ThunarWindow/view-side-pane-shortcuts" "b")
-; (gtk_accel_path "/ThunarWindow/reload-alt-2" "Reload")
-; (gtk_accel_path "/ThunarWindow/view-location-selector-menu" "")
-; (gtk_accel_path "/ThunarStandardView/sort-by-mtime" "")
-; (gtk_accel_path "/ThunarWindow/edit-menu" "")
-; (gtk_accel_path "/ThunarActionManager/copy" "c")
-; (gtk_accel_path "/ThunarWindow/bookmarks-menu" "")
-; (gtk_accel_path "/ThunarStandardView/forward-alt" "Forward")
-; (gtk_accel_path "/ThunarActionManager/move-to-trash" "")
-; (gtk_accel_path "/ThunarWindow/reload-alt-1" "F5")
-; (gtk_accel_path "/ThunarActionManager/delete-3" "KP_Delete")
-; (gtk_accel_path "/ThunarWindow/reload" "r")
-; (gtk_accel_path "/ThunarStandardView/arrange-items-menu" "")
-; (gtk_accel_path "/ThunarStandardView/unselect-all-files" "Escape")
-; (gtk_accel_path "/ThunarWindow/open-computer" "")
-; (gtk_accel_path "/ThunarWindow/toggle-image-preview" "")
-; (gtk_accel_path "/ThunarWindow/toggle-side-pane" "F9")
-; (gtk_accel_path "/ThunarWindow/view-as-icons" "1")
-; (gtk_accel_path "/ThunarActionManager/delete-2" "Delete")
-; (gtk_accel_path "/ThunarWindow/zoom-in" "plus")
-; (gtk_accel_path "/ThunarStandardView/configure-columns" "")
-; (gtk_accel_path "/ThunarStandardView/rename" "F2")
-; (gtk_accel_path "/ThunarWindow/open-location" "l")
-; (gtk_accel_path "/ThunarWindow/view-as-compact-list" "3")
-; (gtk_accel_path "/ThunarWindow/view-menu" "")
-; (gtk_accel_path "/ThunarWindow/search" "f")
-; (gtk_accel_path "/ThunarWindow/new-tab" "t")
-; (gtk_accel_path "/ThunarWindow/zoom-reset" "0")
-; (gtk_accel_path "/ThunarWindow/contents/help-menu" "")
-; (gtk_accel_path "/ThunarActionManager/open-in-new-tab" "p")
-; (gtk_accel_path "/ThunarWindow/view-location-selector-buttons" "")
-; (gtk_accel_path "/ThunarStandardView/back-alt2" "Back")
-; (gtk_accel_path "/ThunarActionManager/redo" "z")
-; (gtk_accel_path "/ThunarWindow/open-trash" "")
-; (gtk_accel_path "/ThunarActionManager/open-in-new-window" "o")
-; (gtk_accel_path "/ThunarWindow/view-statusbar" "")
-; (gtk_accel_path "/ThunarActionManager/open-location" "")
-; (gtk_accel_path "/ThunarStandardView/duplicate" "")
-; (gtk_accel_path "/ThunarActionManager/trash-delete-2" "KP_Delete")
-; (gtk_accel_path "/ThunarStandardView/back-alt1" "BackSpace")
-; (gtk_accel_path "/ThunarStandardView/create-folder" "n")
-; (gtk_accel_path "/ThunarWindow/open-home" "Home")
-; (gtk_accel_path "/ThunarWindow/switch-focused-split-view-pane" "")
-; (gtk_accel_path "/ThunarWindow/show-hidden" "h")
-; (gtk_accel_path "/ThunarStandardView/set-default-app" "")
-; (gtk_accel_path "/ThunarWindow/empty-trash" "")
-; (gtk_accel_path "/ThunarWindow/preferences" "")
-; (gtk_accel_path "/ThunarActionManager/delete" "")
-; (gtk_accel_path "/ThunarWindow/open-network" "")
-; (gtk_accel_path "/ThunarWindow/view-side-pane-tree" "e")
-; (gtk_accel_path "/ThunarWindow/open-file-system" "")
-; (gtk_accel_path "/ThunarWindow/search-alt" "Search")
-; (gtk_accel_path "/ThunarWindow/switch-next-tab-alt" "Tab")
-; (gtk_accel_path "/ThunarActionManager/sendto-desktop" "")
-; (gtk_accel_path "/ThunarStandardView/make-link" "")
-; (gtk_accel_path "/ThunarWindow/zoom-reset-alt" "
-#+HTML: 
-#+HTML:
-#+HTML:
-#+HTML: 
-#+HTML:
-#+HTML:
-#+HTML: 
-#+HTML:
-#+HTML:
-#+HTML: 
-#+HTML:
-#+HTML:
-#+HTML: 
-#+HTML:
-#+HTML: 